]> granicus.if.org Git - python/commitdiff
fix compiler warning by implementing this more cleverly
authorBenjamin Peterson <benjamin@python.org>
Tue, 22 Nov 2011 20:29:32 +0000 (15:29 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 22 Nov 2011 20:29:32 +0000 (15:29 -0500)
Objects/unicodeobject.c

index ff22f859e0f96a90ad6cacc7764326b789cb278b..a7d9e1224c18bf80f79b22f9fdc8bab7bd240100 100644 (file)
@@ -6164,12 +6164,7 @@ PyUnicode_AsRawUnicodeEscapeString(PyObject *unicode)
     kind = PyUnicode_KIND(unicode);
     data = PyUnicode_DATA(unicode);
     len = PyUnicode_GET_LENGTH(unicode);
-
-    switch(kind) {
-    case PyUnicode_1BYTE_KIND: expandsize = 4; break;
-    case PyUnicode_2BYTE_KIND: expandsize = 6; break;
-    case PyUnicode_4BYTE_KIND: expandsize = 10; break;
-    }
+    expandsize = kind * 2 + 2;
 
     if (len > PY_SSIZE_T_MAX / expandsize)
         return PyErr_NoMemory();