Use anylib_count in unicode_count_impl

sobolevn · sobolevn · commit 2dabc73cc3df · 2022-10-12T18:19:20.000+03:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -8964,6 +8964,21 @@ _PyUnicode_InsertThousandsGrouping(
     return count;
 }
 
+static Py_ssize_t
+anylib_count(int kind, PyObject *sstr, const void* sbuf, Py_ssize_t slen,
+             PyObject *str1, const void *buf1, Py_ssize_t len1, Py_ssize_t maxcount)
+{
+    switch (kind) {
+    case PyUnicode_1BYTE_KIND:
+        return ucs1lib_count(sbuf, slen, buf1, len1, maxcount);
+    case PyUnicode_2BYTE_KIND:
+        return ucs2lib_count(sbuf, slen, buf1, len1, maxcount);
+    case PyUnicode_4BYTE_KIND:
+        return ucs4lib_count(sbuf, slen, buf1, len1, maxcount);
+    }
+    Py_UNREACHABLE();
+}
+
 static Py_ssize_t
 unicode_count_impl(PyObject *str,
                    PyObject *substr,
@@ -8997,28 +9012,10 @@ unicode_count_impl(PyObject *str,
             goto onError;
     }
 
-    switch (kind1) {
-    case PyUnicode_1BYTE_KIND:
-        result = ucs1lib_count(
-            ((const Py_UCS1*)buf1) + start, end - start,
-            buf2, len2, PY_SSIZE_T_MAX
-            );
-        break;
-    case PyUnicode_2BYTE_KIND:
-        result = ucs2lib_count(
-            ((const Py_UCS2*)buf1) + start, end - start,
-            buf2, len2, PY_SSIZE_T_MAX
-            );
-        break;
-    case PyUnicode_4BYTE_KIND:
-        result = ucs4lib_count(
-            ((const Py_UCS4*)buf1) + start, end - start,
-            buf2, len2, PY_SSIZE_T_MAX
-            );
-        break;
-    default:
-        Py_UNREACHABLE();
-    }
+    result = anylib_count(kind1,
+                          str, buf1 + start, end - start,
+                          substr, buf2, len2,
+                          PY_SSIZE_T_MAX);
 
     assert((kind2 != kind1) == (buf2 != PyUnicode_DATA(substr)));
     if (kind2 != kind1)
@@ -9903,21 +9900,6 @@ anylib_find(int kind, PyObject *str1, const void *buf1, Py_ssize_t len1,
     Py_UNREACHABLE();
 }
 
-static Py_ssize_t
-anylib_count(int kind, PyObject *sstr, const void* sbuf, Py_ssize_t slen,
-             PyObject *str1, const void *buf1, Py_ssize_t len1, Py_ssize_t maxcount)
-{
-    switch (kind) {
-    case PyUnicode_1BYTE_KIND:
-        return ucs1lib_count(sbuf, slen, buf1, len1, maxcount);
-    case PyUnicode_2BYTE_KIND:
-        return ucs2lib_count(sbuf, slen, buf1, len1, maxcount);
-    case PyUnicode_4BYTE_KIND:
-        return ucs4lib_count(sbuf, slen, buf1, len1, maxcount);
-    }
-    Py_UNREACHABLE();
-}
-
 static void
 replace_1char_inplace(PyObject *u, Py_ssize_t pos,
                       Py_UCS4 u1, Py_UCS4 u2, Py_ssize_t maxcount)
