commit 0fcab4a3ed5e39769609b60d6179c4c801e45985
author Victor Stinner <victor.stinner@haypocalc.com> Tue Jan 04 12:59:15 2011 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Tue Jan 04 12:59:15 2011 +0000
tree fc5592e351ed18a96d7e94aeb2ced52c0ba2fd0d
parent 6ab8e8298eba1d52debc53d6e6a38d419bb255c0

Issue #9566: use Py_ssize_t instead of int

Modules/unicodedata.c

diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index bd96e36..463be2c 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -403,7 +403,8 @@
 {
     PyUnicodeObject *v;
     char decomp[256];
-    int code, index, count, i;
+    int code, index, count;
+    size_t i;
     unsigned int prefix_index;
     Py_UCS4 c;
 
@@ -450,15 +451,12 @@
     while (count-- > 0) {
         if (i)
             decomp[i++] = ' ';
-        assert((size_t)i < sizeof(decomp));
+        assert(i < sizeof(decomp));
         PyOS_snprintf(decomp + i, sizeof(decomp) - i, "%04X",
                       decomp_data[++index]);
         i += strlen(decomp + i);
     }
-
-    decomp[i] = '\0';
-
-    return PyUnicode_FromString(decomp);
+    return PyUnicode_FromStringAndSize(decomp, i);
 }
 
 static void