summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-10-03 20:15:21 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-10-03 20:15:21 (GMT)
commit01c549642a2b9e11c745e3572a8801dcc580b2ae (patch)
tree31f5452acd4100ec0c0d14cc7d7aa87d468c8c2a /Objects
parent3eaed9c49fd50859782128e90d6a368f872dfc84 (diff)
downloadcpython-01c549642a2b9e11c745e3572a8801dcc580b2ae.zip
cpython-01c549642a2b9e11c745e3572a8801dcc580b2ae.tar.gz
cpython-01c549642a2b9e11c745e3572a8801dcc580b2ae.tar.bz2
Merged revisions 75220 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75220 | mark.dickinson | 2009-10-03 21:13:37 +0100 (Sat, 03 Oct 2009) | 1 line Use size_t instead of int for a PyMem_MALLOC argument; silences a gcc 'comparison always false' warning. ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/capsule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/capsule.c b/Objects/capsule.c
index 3d2d626..e25af6c 100644
--- a/Objects/capsule.c
+++ b/Objects/capsule.c
@@ -197,7 +197,7 @@ PyCapsule_Import(const char *name, int no_block)
PyObject *object = NULL;
void *return_value = NULL;
char *trace;
- int name_length = (strlen(name) + 1) * sizeof(char);
+ size_t name_length = (strlen(name) + 1) * sizeof(char);
char *name_dup = (char *)PyMem_MALLOC(name_length);
if (!name_dup) {