- coverity

[oweals/gnunet.git] / src / namestore / namestore_common.c

diff --git a/src/namestore/namestore_common.c b/src/namestore/namestore_common.c
index 023f20f431e8772e84f2110674dbcdbee9cd1886..24711ba470c8326ca45c677fe716a6d14e91a8c9 100644 (file)
--- a/src/namestore/namestore_common.c
+++ b/src/namestore/namestore_common.c
@@ -286,10 +286,11 @@ GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey *key
 int
 GNUNET_NAMESTORE_check_name (const char * name)
 {
-  int res = GNUNET_OK;
+  if (name == NULL)
+    return GNUNET_SYSERR;
   if (strlen (name) > 63)
-    res = GNUNET_SYSERR;
-  return res;
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
 }
 
 
@@ -377,7 +378,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
 {
   struct in_addr value_a;
   struct in6_addr value_aaaa;
-  GNUNET_HashCode pkey;
+  struct GNUNET_CRYPTO_ShortHashCode pkey;
 
   switch (type)
   {
@@ -418,15 +419,16 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
     if (1 != inet_pton (AF_INET6, s, &value_aaaa))    
       return GNUNET_SYSERR;    
     *data = GNUNET_malloc (sizeof (struct in6_addr));
+    *data_size = sizeof (struct in6_addr);
     memcpy (*data, &value_aaaa, sizeof (value_aaaa));
     return GNUNET_OK;
   case GNUNET_NAMESTORE_TYPE_PKEY:
     if (GNUNET_OK !=
-       GNUNET_CRYPTO_hash_from_string (s, &pkey))
+       GNUNET_CRYPTO_short_hash_from_string (s, &pkey))
       return GNUNET_SYSERR;
-    *data = GNUNET_malloc (sizeof (GNUNET_HashCode));
+    *data = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
     memcpy (*data, &pkey, sizeof (pkey));
-    *data_size = sizeof (GNUNET_HashCode);
+    *data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
     return GNUNET_OK;
   case GNUNET_NAMESTORE_TYPE_PSEU:
     *data = GNUNET_strdup (s);