pool: Support null 'pool' argument in pool_vasprintf().

[pspp] / src / libpspp / i18n.c

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 4e04d32c25f39564af7fa7acc451389acaf4eebe..dc36c73dc552130009fa4d0475d6c3d5b2d51bf4 100644 (file)
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -880,7 +880,15 @@ utf8_hash_case_bytes (const char *s, size_t n, unsigned int basis)
 unsigned int
 utf8_hash_case_string (const char *s, unsigned int basis)
 {
-  return utf8_hash_case_bytes (s, strlen (s), basis);
+  return utf8_hash_case_substring (ss_cstr (s), basis);
+}
+
+/* Returns a hash value for UTF-8 string S, with lowercase and uppercase
+   letters treated as equal, starting from BASIS. */
+unsigned int
+utf8_hash_case_substring (struct substring s, unsigned int basis)
+{
+  return utf8_hash_case_bytes (s.string, s.length, basis);
 }
 
 /* Compares UTF-8 strings A and B case-insensitively.
@@ -888,7 +896,13 @@ utf8_hash_case_string (const char *s, unsigned int basis)
 int
 utf8_strcasecmp (const char *a, const char *b)
 {
-  return utf8_strncasecmp (a, strlen (a), b, strlen (b));
+  return utf8_sscasecmp (ss_cstr (a), ss_cstr (b));
+}
+
+int
+utf8_sscasecmp (struct substring a, struct substring b)
+{
+  return utf8_strncasecmp (a.string, a.length, b.string, b.length);
 }
 
 /* Compares UTF-8 strings A (with length AN) and B (with length BN)
@@ -1054,9 +1068,9 @@ get_encoding_info (struct encoding_info *e, const char *name)
       ss_dealloc (&cr);
       ss_dealloc (&lf);
       ss_dealloc (&space);
-      ss_alloc_substring (&cr, ss_cstr ("\r"));
-      ss_alloc_substring (&lf, ss_cstr ("\n"));
-      ss_alloc_substring (&space, ss_cstr (" "));
+      cr = ss_clone (ss_cstr ("\r"));
+      lf = ss_clone (ss_cstr ("\n"));
+      space = ss_clone (ss_cstr (" "));
     }
 
   e->unit = cr.length;