summaryrefslogtreecommitdiff
path: root/Python/modsupport.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-09-29 04:01:43 +0200
committerVictor Stinner <victor.stinner@haypocalc.com>2011-09-29 04:01:43 +0200
commitc9c3ace041fe6342cf1c26f971a8d1e338242248 (patch)
tree03c5c443895953a9203d51987b6f60aa93300a28 /Python/modsupport.c
parent6283a7e366ef5781097fde3446e9b829cd8b03a1 (diff)
downloadcpython-c9c3ace041fe6342cf1c26f971a8d1e338242248.tar.gz
modsupport.c reuses Py_UNICODE_strlen()
Diffstat (limited to 'Python/modsupport.c')
-rw-r--r--Python/modsupport.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/Python/modsupport.c b/Python/modsupport.c
index 08f5065883..428914f378 100644
--- 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;