[Python-checkins] r75221 - in python/branches/release31-maint: Objects/capsule.c

[mark.dickinson]

Author: mark.dickinson
Date: Sat Oct  3 22:15:21 2009
New Revision: 75221

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Objects/capsule.c

Modified: python/branches/release31-maint/Objects/capsule.c
==============================================================================
--- python/branches/release31-maint/Objects/capsule.c	(original)
+++ python/branches/release31-maint/Objects/capsule.c	Sat Oct  3 22:15:21 2009
@@ -197,7 +197,7 @@
     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) {