Optimize creation of multibyte menu items on Android

* src/androidvfs.c (android_verify_jni_string): Move to
android.c.
* src/android.c (android_verify_jni_string): New function.
(android_build_string): Forgo encoding menu text if TEXT is a
multibyte string that's also a valid JNI string.
* src/android.h: Update prototypes.

1 files changed, 0 insertions, 63 deletions

diff --git a/src/androidvfs.c b/src/androidvfs.c
index 2b467bc444f..0d99116c75c 100644
--- a/src/androidvfs.c
+++ b/src/androidvfs.c
@@ -3299,9 +3299,6 @@ static struct android_saf_root_vdir *all_saf_root_vdirs;
 static struct android_vnode *android_saf_tree_from_name (char *, const char *,
                                                          const char *);
 
-/* Forward declaration.  */
-static int android_verify_jni_string (const char *);
-
 /* Ascertain and return whether or not AUTHORITY designates a content
    provider offering at least one directory tree accessible to
    Emacs.  */
@@ -4437,66 +4434,6 @@ static struct android_vops saf_new_vfs_ops;
 /* Chain of all open SAF directory streams.  */
 static struct android_saf_tree_vdir *all_saf_tree_vdirs;
 
-/* Verify that the specified NULL-terminated STRING is a valid JNI
-   ``UTF-8'' string.  Return 0 if so, 1 otherwise.
-
-   The native coding system used by the JVM to store strings derives
-   from UTF-8, but deviates from it in two aspects in an attempt to
-   better represent the UCS-16 based Java String format, and to let
-   strings contain NULL characters while remaining valid C strings:
-   NULL bytes are encoded as two-byte sequences, and Unicode surrogate
-   pairs encoded as two-byte sequences are prefered to four-byte
-   sequences when encoding characters above the BMP.  */
-
-static int
-android_verify_jni_string (const char *name)
-{
-  const unsigned char *chars;
-
-  chars = (unsigned char *) name;
-  while (*chars)
-    {
-      /* Switch on the high 4 bits.  */
-
-      switch (*chars++ >> 4)
-        {
-        case 0 ... 7:
-          /* The 8th bit is clean, so this is a regular C
-             character.  */
-          break;
-
-        case 8 ... 0xb:
-          /* Invalid starting byte! */
-          return 1;
-
-        case 0xf:
-          /* The start of a four byte sequence.  These aren't allowed
-             in Java.  */
-          return 1;
-
-        case 0xe:
-          /* The start of a three byte sequence.  Verify that its
-             continued.  */
-
-          if ((*chars++ & 0xc0) != 0x80)
-            return 1;
-
-          FALLTHROUGH;
-
-        case 0xc ... 0xd:
-          /* The start of a two byte sequence.  Verify that the
-             next byte exists and has its high bit set.  */
-
-          if ((*chars++ & 0xc0) != 0x80)
-            return 1;
-
-          break;
-        }
-    }
-
-  return 0;
-}
-
 /* Find the document ID of the file within TREE_URI designated by
    NAME.