From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 3 Oct 2009 20:15:21 +0000 (+0000)
Subject: Merged revisions 75220 via svnmerge from
X-Git-Tag: v3.1.2rc1~465
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01c549642a2b9e11c745e3572a8801dcc580b2ae;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Objects/capsule.c b/Objects/capsule.c
index 3d2d626adec0..e25af6c2aa8f 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) {