Config returns code unit count for strings - didn't always.

git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@142 6239d852-aaf2-0410-a92c-79f79f948069

2 files changed, 8 insertions, 11 deletions

diff --git a/src/pcre2_config.c b/src/pcre2_config.c
index d8bc1c3..36e6b48 100644
--- a/src/pcre2_config.c
+++ b/src/pcre2_config.c
@@ -129,9 +129,8 @@ switch (what)
 #ifdef SUPPORT_JIT
     {
     const char *v = PRIV(jit_get_target)();
-    return (where == NULL)?
-      (int)((strlen(v) + 1) * sizeof(PCRE2_UCHAR)) :
-      PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v) + 1;
+    return 1 + ((where == NULL)?
+      (int)strlen(v) : PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v));
     }
 #else
   return PCRE2_ERROR_BADOPTION;
@@ -172,10 +171,9 @@ switch (what)
 #else
     const char *v = "Unicode not supported";
 #endif
-    return (where == NULL)?
-      (int)((strlen(v) + 1) * sizeof(PCRE2_UCHAR)) :
-      PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v) + 1;
-    }
+    return 1 + ((where == NULL)?
+      (int)strlen(v): PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v));
+   }
   break;
 
   case PCRE2_CONFIG_UNICODE:
@@ -210,9 +208,8 @@ switch (what)
     const char *v = (XSTRING(Z PCRE2_PRERELEASE)[1] == 0)?
       XSTRING(PCRE2_MAJOR.PCRE2_MINOR PCRE2_DATE) :
       XSTRING(PCRE2_MAJOR.PCRE2_MINOR) XSTRING(PCRE2_PRERELEASE PCRE2_DATE);
-    return (where == NULL)?
-      (int)((strlen(v) + 1) * sizeof(PCRE2_UCHAR)) :
-      PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v) + 1;
+    return 1 + ((where == NULL)?
+      (int)strlen(v) : PRIV(strcpy_c8)((PCRE2_UCHAR *)where, v));
     }
   }
 
diff --git a/src/pcre2test.c b/src/pcre2test.c
index b652fa2..9bd7a4d 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
@@ -5768,7 +5768,7 @@ if (rc != 0)
   print_unicode_version(stdout);
   printf(")\n");
   }
-else printf("  No UTF or UCP support\n");
+else printf("  No Unicode support\n");
 
 (void)PCRE2_CONFIG(PCRE2_CONFIG_JIT, &rc);
 if (rc != 0)