-simplify utf8_tolower/upper APIs

5 files changed, 29 insertions, 27 deletions

diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 530318808..d2e5cda85 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -758,7 +758,7 @@ handle_lookup (void *cls,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  GNUNET_STRINGS_utf8_tolower (utf_in, &nameptr);
+  GNUNET_STRINGS_utf8_tolower (utf_in, nameptr);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 
   clh = GNUNET_new (struct ClientLookupHandle);
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index aee1f9fd2..91cbcf017 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -45,10 +45,10 @@
 char *
 GNUNET_GNSRECORD_string_to_lowercase (const char *src)
 {
-  GNUNET_assert (NULL != src);
-  char *res = strdup (src);
-  /* normalize */
-  GNUNET_STRINGS_utf8_tolower(src, &res);
+  char *res;
+
+  res = GNUNET_strdup (src);
+  GNUNET_STRINGS_utf8_tolower (src, res);
   return res;
 }
 
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 8bb8cfb06..686be93ad 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -153,27 +153,27 @@ GNUNET_STRINGS_from_utf8 (const char *input,
 
 
 /**
- * Convert the utf-8 input string to lowercase
- * Output needs to be allocated appropriately
+ * Convert the utf-8 input string to lower case.
+ * Output needs to be allocated appropriately.
  *
  * @param input input string
  * @param output output buffer
  */
 void
-GNUNET_STRINGS_utf8_tolower (const char* input,
-                             char** output);
+GNUNET_STRINGS_utf8_tolower (const char *input,
+                             char *output);
 
 
 /**
- * Convert the utf-8 input string to lowercase
- * Output needs to be allocated appropriately
+ * Convert the utf-8 input string to upper case.
+ * Output needs to be allocated appropriately.
  *
  * @param input input string
  * @param output output buffer
  */
 void
-GNUNET_STRINGS_utf8_toupper (const char* input,
-                             char** output);
+GNUNET_STRINGS_utf8_toupper (const char *input,
+                             char *output);
 
 
 /**
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index cd2ea75bf..e14e7c898 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -274,12 +274,12 @@ GNUNET_CRYPTO_hash_to_enc (const struct GNUNET_HashCode *block,
 int
 GNUNET_CRYPTO_hash_from_string2 (const char *enc,
                                  size_t enclen,
-                                struct GNUNET_HashCode *result)
+                                 struct GNUNET_HashCode *result)
 {
   char upper_enc[enclen];
-  char* up_ptr = upper_enc;
+  char *up_ptr = upper_enc;
 
-  GNUNET_STRINGS_utf8_toupper(enc, &up_ptr);
+  GNUNET_STRINGS_utf8_toupper (enc, up_ptr);
 
   return GNUNET_STRINGS_string_to_data (upper_enc, enclen,
                                         (unsigned char*) result,
diff --git a/src/util/strings.c b/src/util/strings.c
index 00c0cf0e1..d5c752fe1 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -492,44 +492,46 @@ GNUNET_STRINGS_from_utf8 (const char *input,
 
 
 /**
- * Convert the utf-8 input string to lowercase
- * Output needs to be allocated appropriately
+ * Convert the utf-8 input string to lowercase.
+ * Output needs to be allocated appropriately.
  *
  * @param input input string
  * @param output output buffer
  */
 void
-GNUNET_STRINGS_utf8_tolower(const char* input, char** output)
+GNUNET_STRINGS_utf8_tolower (const char *input,
+                             char *output)
 {
   uint8_t *tmp_in;
   size_t len;
 
   tmp_in = u8_tolower ((uint8_t*)input, strlen ((char *) input),
                        NULL, UNINORM_NFD, NULL, &len);
-  memcpy(*output, tmp_in, len);
-  (*output)[len] = '\0';
+  memcpy(output, tmp_in, len);
+  output[len] = '\0';
   free(tmp_in);
 }
 
 
 /**
- * Convert the utf-8 input string to uppercase
- * Output needs to be allocated appropriately
+ * Convert the utf-8 input string to uppercase.
+ * Output needs to be allocated appropriately.
  *
  * @param input input string
  * @param output output buffer
  */
 void
-GNUNET_STRINGS_utf8_toupper(const char* input, char** output)
+GNUNET_STRINGS_utf8_toupper(const char *input,
+                            char *output)
 {
   uint8_t *tmp_in;
   size_t len;
 
   tmp_in = u8_toupper ((uint8_t*)input, strlen ((char *) input),
                        NULL, UNINORM_NFD, NULL, &len);
-  memcpy(*output, tmp_in, len);
-  (*output)[len] = '\0';
-  free(tmp_in);
+  memcpy (output, tmp_in, len);
+  output[len] = '\0';
+  free (tmp_in);
 }