modsupport.c reuses Py_UNICODE_strlen()

Victor Stinner · Victor Stinner · commit d9c563e84d35 · 2011-09-29T04:01:43.000+02:00
diff --git a/Python/modsupport.c b/Python/modsupport.c
@@ -148,15 +148,6 @@ do_mklist(const char **p_format, va_list *p_va, int endchar, int n, int flags)
     return v;
 }
 
-static int
-_ustrlen(Py_UNICODE *u)
-{
-    int i = 0;
-    Py_UNICODE *v = u;
-    while (*v != 0) { i++; v++; }
-    return i;
-}
-
 static PyObject *
 do_mktuple(const char **p_format, va_list *p_va, int endchar, int n, int flags)
 {
@@ -269,7 +260,7 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags)
             }
             else {
                 if (n < 0)
-                    n = _ustrlen(u);
+                    n = Py_UNICODE_strlen(u);
                 v = PyUnicode_FromUnicode(u, n);
             }
             return v;

Original file line number	Diff line number	Diff line change
`@@ -148,15 +148,6 @@ do_mklist(const char *p_format, va_list p_va, int endchar, int n, int flags)`
`148`	`148`	`return v;`
`149`	`149`	`}`
`150`	`150`
`151`		`-static int`
`152`		`-_ustrlen(Py_UNICODE *u)`
`153`		`-{`
`154`		`- int i = 0;`
`155`		`- Py_UNICODE *v = u;`
`156`		`- while (*v != 0) { i++; v++; }`
`157`		`- return i;`
`158`		`-}`
`159`		`-`
`160`	`151`	`static PyObject *`
`161`	`152`	`do_mktuple(const char *p_format, va_list p_va, int endchar, int n, int flags)`
`162`	`153`	`{`
`@@ -269,7 +260,7 @@ do_mkvalue(const char *p_format, va_list p_va, int flags)`
`269`	`260`	`}`
`270`	`261`	`else {`
`271`	`262`	`if (n < 0)`
`272`		`- n = _ustrlen(u);`
	`263`	`+ n = Py_UNICODE_strlen(u);`
`273`	`264`	`v = PyUnicode_FromUnicode(u, n);`
`274`	`265`	`}`
`275`	`266`	`return v;`