global reindent, now with uncrustify hook enabled

1 files changed, 153 insertions, 152 deletions

diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c
index 094307ea3..e0bc4fb0c 100644
--- a/src/gns/plugin_gnsrecord_gns.c
+++ b/src/gns/plugin_gnsrecord_gns.c
@@ -44,49 +44,49 @@
  * @return NULL on error, otherwise human-readable representation of the value
  */
 static char *
-gns_value_to_string(void *cls,
-                    uint32_t type,
-                    const void *data,
-                    size_t data_size)
+gns_value_to_string (void *cls,
+                     uint32_t type,
+                     const void *data,
+                     size_t data_size)
 {
   const char *cdata;
 
   switch (type)
-    {
-    case GNUNET_GNSRECORD_TYPE_PKEY:
-      if (data_size != sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey))
-        return NULL;
-      return GNUNET_CRYPTO_ecdsa_public_key_to_string(data);
+  {
+  case GNUNET_GNSRECORD_TYPE_PKEY:
+    if (data_size != sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey))
+      return NULL;
+    return GNUNET_CRYPTO_ecdsa_public_key_to_string (data);
 
-    case GNUNET_GNSRECORD_TYPE_NICK:
-      return GNUNET_strndup(data, data_size);
+  case GNUNET_GNSRECORD_TYPE_NICK:
+    return GNUNET_strndup (data, data_size);
 
-    case GNUNET_GNSRECORD_TYPE_LEHO:
-      return GNUNET_strndup(data, data_size);
+  case GNUNET_GNSRECORD_TYPE_LEHO:
+    return GNUNET_strndup (data, data_size);
 
-    case GNUNET_GNSRECORD_TYPE_GNS2DNS: {
+  case GNUNET_GNSRECORD_TYPE_GNS2DNS: {
       char *ns;
       char *ip;
       size_t off;
       char *nstr;
 
       off = 0;
-      ns = GNUNET_DNSPARSER_parse_name(data, data_size, &off);
-      ip = GNUNET_DNSPARSER_parse_name(data, data_size, &off);
+      ns = GNUNET_DNSPARSER_parse_name (data, data_size, &off);
+      ip = GNUNET_DNSPARSER_parse_name (data, data_size, &off);
       if ((NULL == ns) || (NULL == ip) || (off != data_size))
-        {
-          GNUNET_break_op(0);
-          GNUNET_free_non_null(ns);
-          GNUNET_free_non_null(ip);
-          return NULL;
-        }
-      GNUNET_asprintf(&nstr, "%s@%s", ns, ip);
-      GNUNET_free_non_null(ns);
-      GNUNET_free_non_null(ip);
+      {
+        GNUNET_break_op (0);
+        GNUNET_free_non_null (ns);
+        GNUNET_free_non_null (ip);
+        return NULL;
+      }
+      GNUNET_asprintf (&nstr, "%s@%s", ns, ip);
+      GNUNET_free_non_null (ns);
+      GNUNET_free_non_null (ip);
       return nstr;
     }
 
-    case GNUNET_GNSRECORD_TYPE_VPN: {
+  case GNUNET_GNSRECORD_TYPE_VPN: {
       struct GNUNET_TUN_GnsVpnRecord vpn;
       char *vpn_str;
 
@@ -94,16 +94,16 @@ gns_value_to_string(void *cls,
       if ((data_size <= sizeof(vpn)) || ('\0' != cdata[data_size - 1]))
         return NULL; /* malformed */
       /* need to memcpy for alignment */
-      GNUNET_memcpy(&vpn, data, sizeof(vpn));
-      GNUNET_asprintf(&vpn_str,
-                      "%u %s %s",
-                      (unsigned int)ntohs(vpn.proto),
-                      (const char *)GNUNET_i2s_full(&vpn.peer),
-                      (const char *)&cdata[sizeof(vpn)]);
+      GNUNET_memcpy (&vpn, data, sizeof(vpn));
+      GNUNET_asprintf (&vpn_str,
+                       "%u %s %s",
+                       (unsigned int) ntohs (vpn.proto),
+                       (const char *) GNUNET_i2s_full (&vpn.peer),
+                       (const char *) &cdata[sizeof(vpn)]);
       return vpn_str;
     }
 
-    case GNUNET_GNSRECORD_TYPE_BOX: {
+  case GNUNET_GNSRECORD_TYPE_BOX: {
       struct GNUNET_GNSRECORD_BoxRecord box;
       uint32_t rt;
       char *box_str;
@@ -112,26 +112,26 @@ gns_value_to_string(void *cls,
       cdata = data;
       if (data_size < sizeof(struct GNUNET_GNSRECORD_BoxRecord))
         return NULL; /* malformed */
-      GNUNET_memcpy(&box, data, sizeof(box));
-      rt = ntohl(box.record_type);
-      ival = GNUNET_GNSRECORD_value_to_string(rt,
-                                              &cdata[sizeof(box)],
-                                              data_size - sizeof(box));
+      GNUNET_memcpy (&box, data, sizeof(box));
+      rt = ntohl (box.record_type);
+      ival = GNUNET_GNSRECORD_value_to_string (rt,
+                                               &cdata[sizeof(box)],
+                                               data_size - sizeof(box));
       if (NULL == ival)
         return NULL; /* malformed */
-      GNUNET_asprintf(&box_str,
-                      "%u %u %u %s",
-                      (unsigned int)ntohs(box.protocol),
-                      (unsigned int)ntohs(box.service),
-                      (unsigned int)rt,
-                      ival);
-      GNUNET_free(ival);
+      GNUNET_asprintf (&box_str,
+                       "%u %u %u %s",
+                       (unsigned int) ntohs (box.protocol),
+                       (unsigned int) ntohs (box.service),
+                       (unsigned int) rt,
+                       ival);
+      GNUNET_free (ival);
       return box_str;
     }
 
-    default:
-      return NULL;
-    }
+  default:
+    return NULL;
+  }
 }
 
 
@@ -147,112 +147,112 @@ gns_value_to_string(void *cls,
  * @return #GNUNET_OK on success
  */
 static int
-gns_string_to_value(void *cls,
-                    uint32_t type,
-                    const char *s,
-                    void **data,
-                    size_t *data_size)
+gns_string_to_value (void *cls,
+                     uint32_t type,
+                     const char *s,
+                     void **data,
+                     size_t *data_size)
 {
   struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
 
   if (NULL == s)
     return GNUNET_SYSERR;
   switch (type)
+  {
+  case GNUNET_GNSRECORD_TYPE_PKEY:
+    if (GNUNET_OK !=
+        GNUNET_CRYPTO_ecdsa_public_key_from_string (s, strlen (s), &pkey))
     {
-    case GNUNET_GNSRECORD_TYPE_PKEY:
-      if (GNUNET_OK !=
-          GNUNET_CRYPTO_ecdsa_public_key_from_string(s, strlen(s), &pkey))
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     _("Unable to parse PKEY record `%s'\n"),
-                     s);
-          return GNUNET_SYSERR;
-        }
-      *data = GNUNET_new(struct GNUNET_CRYPTO_EcdsaPublicKey);
-      GNUNET_memcpy(*data, &pkey, sizeof(pkey));
-      *data_size = sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey);
-      return GNUNET_OK;
-
-    case GNUNET_GNSRECORD_TYPE_NICK:
-      *data = GNUNET_strdup(s);
-      *data_size = strlen(s);
-      return GNUNET_OK;
-
-    case GNUNET_GNSRECORD_TYPE_LEHO:
-      *data = GNUNET_strdup(s);
-      *data_size = strlen(s);
-      return GNUNET_OK;
-
-    case GNUNET_GNSRECORD_TYPE_GNS2DNS: {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _ ("Unable to parse PKEY record `%s'\n"),
+                  s);
+      return GNUNET_SYSERR;
+    }
+    *data = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey);
+    GNUNET_memcpy (*data, &pkey, sizeof(pkey));
+    *data_size = sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey);
+    return GNUNET_OK;
+
+  case GNUNET_GNSRECORD_TYPE_NICK:
+    *data = GNUNET_strdup (s);
+    *data_size = strlen (s);
+    return GNUNET_OK;
+
+  case GNUNET_GNSRECORD_TYPE_LEHO:
+    *data = GNUNET_strdup (s);
+    *data_size = strlen (s);
+    return GNUNET_OK;
+
+  case GNUNET_GNSRECORD_TYPE_GNS2DNS: {
       char nsbuf[514];
       char *cpy;
       char *at;
       size_t off;
 
-      cpy = GNUNET_strdup(s);
-      at = strchr(cpy, '@');
+      cpy = GNUNET_strdup (s);
+      at = strchr (cpy, '@');
       if (NULL == at)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     _("Unable to parse GNS2DNS record `%s'\n"),
-                     s);
-          GNUNET_free(cpy);
-          return GNUNET_SYSERR;
-        }
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Unable to parse GNS2DNS record `%s'\n"),
+                    s);
+        GNUNET_free (cpy);
+        return GNUNET_SYSERR;
+      }
       *at = '\0';
       at++;
 
       off = 0;
-      if ((GNUNET_OK != GNUNET_DNSPARSER_builder_add_name(nsbuf,
-                                                          sizeof(nsbuf),
-                                                          &off,
-                                                          cpy)) ||
+      if ((GNUNET_OK != GNUNET_DNSPARSER_builder_add_name (nsbuf,
+                                                           sizeof(nsbuf),
+                                                           &off,
+                                                           cpy)) ||
           (GNUNET_OK !=
-           GNUNET_DNSPARSER_builder_add_name(nsbuf, sizeof(nsbuf), &off, at)))
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     _("Failed to serialize GNS2DNS record with value `%s'\n"),
-                     s);
-          GNUNET_free(cpy);
-          return GNUNET_SYSERR;
-        }
-      GNUNET_free(cpy);
+           GNUNET_DNSPARSER_builder_add_name (nsbuf, sizeof(nsbuf), &off, at)))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Failed to serialize GNS2DNS record with value `%s'\n"),
+                    s);
+        GNUNET_free (cpy);
+        return GNUNET_SYSERR;
+      }
+      GNUNET_free (cpy);
       *data_size = off;
-      *data = GNUNET_malloc(off);
-      GNUNET_memcpy(*data, nsbuf, off);
+      *data = GNUNET_malloc (off);
+      GNUNET_memcpy (*data, nsbuf, off);
       return GNUNET_OK;
     }
 
-    case GNUNET_GNSRECORD_TYPE_VPN: {
+  case GNUNET_GNSRECORD_TYPE_VPN: {
       struct GNUNET_TUN_GnsVpnRecord *vpn;
       char s_peer[103 + 1];
       char s_serv[253 + 1];
       unsigned int proto;
 
-      if (3 != sscanf(s, "%u %103s %253s", &proto, s_peer, s_serv))
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     _("Unable to parse VPN record string `%s'\n"),
-                     s);
-          return GNUNET_SYSERR;
-        }
-      *data_size = sizeof(struct GNUNET_TUN_GnsVpnRecord) + strlen(s_serv) + 1;
-      *data = vpn = GNUNET_malloc(*data_size);
+      if (3 != sscanf (s, "%u %103s %253s", &proto, s_peer, s_serv))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Unable to parse VPN record string `%s'\n"),
+                    s);
+        return GNUNET_SYSERR;
+      }
+      *data_size = sizeof(struct GNUNET_TUN_GnsVpnRecord) + strlen (s_serv) + 1;
+      *data = vpn = GNUNET_malloc (*data_size);
       if (GNUNET_OK !=
-          GNUNET_CRYPTO_eddsa_public_key_from_string((char *)s_peer,
-                                                     strlen(s_peer),
-                                                     &vpn->peer.public_key))
-        {
-          GNUNET_free(vpn);
-          *data_size = 0;
-          return GNUNET_SYSERR;
-        }
-      vpn->proto = htons((uint16_t)proto);
-      strcpy((char *)&vpn[1], s_serv);
+          GNUNET_CRYPTO_eddsa_public_key_from_string ((char *) s_peer,
+                                                      strlen (s_peer),
+                                                      &vpn->peer.public_key))
+      {
+        GNUNET_free (vpn);
+        *data_size = 0;
+        return GNUNET_SYSERR;
+      }
+      vpn->proto = htons ((uint16_t) proto);
+      strcpy ((char *) &vpn[1], s_serv);
       return GNUNET_OK;
     }
 
-    case GNUNET_GNSRECORD_TYPE_BOX: {
+  case GNUNET_GNSRECORD_TYPE_BOX: {
       struct GNUNET_GNSRECORD_BoxRecord *box;
       size_t rest;
       unsigned int protocol;
@@ -261,32 +261,32 @@ gns_string_to_value(void *cls,
       void *bval;
       size_t bval_size;
 
-      if (3 != sscanf(s, "%u %u %u ", &protocol, &service, &record_type))
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     _("Unable to parse BOX record string `%s'\n"),
-                     s);
-          return GNUNET_SYSERR;
-        }
-      rest = snprintf(NULL, 0, "%u %u %u ", protocol, service, record_type);
-      if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value(record_type,
-                                                        &s[rest],
-                                                        &bval,
-                                                        &bval_size))
+      if (3 != sscanf (s, "%u %u %u ", &protocol, &service, &record_type))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Unable to parse BOX record string `%s'\n"),
+                    s);
+        return GNUNET_SYSERR;
+      }
+      rest = snprintf (NULL, 0, "%u %u %u ", protocol, service, record_type);
+      if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (record_type,
+                                                         &s[rest],
+                                                         &bval,
+                                                         &bval_size))
         return GNUNET_SYSERR;
       *data_size = sizeof(struct GNUNET_GNSRECORD_BoxRecord) + bval_size;
-      *data = box = GNUNET_malloc(*data_size);
-      box->protocol = htons(protocol);
-      box->service = htons(service);
-      box->record_type = htonl(record_type);
-      GNUNET_memcpy(&box[1], bval, bval_size);
-      GNUNET_free(bval);
+      *data = box = GNUNET_malloc (*data_size);
+      box->protocol = htons (protocol);
+      box->service = htons (service);
+      box->record_type = htonl (record_type);
+      GNUNET_memcpy (&box[1], bval, bval_size);
+      GNUNET_free (bval);
       return GNUNET_OK;
     }
 
-    default:
-      return GNUNET_SYSERR;
-    }
+  default:
+    return GNUNET_SYSERR;
+  }
 }
 
 
@@ -294,7 +294,8 @@ gns_string_to_value(void *cls,
  * Mapping of record type numbers to human-readable
  * record type names.
  */
-static struct {
+static struct
+{
   const char *name;
   uint32_t number;
 } gns_name_map[] = { { "PKEY", GNUNET_GNSRECORD_TYPE_PKEY },
@@ -314,13 +315,13 @@ static struct {
  * @return corresponding number, UINT32_MAX on error
  */
 static uint32_t
-gns_typename_to_number(void *cls, const char *gns_typename)
+gns_typename_to_number (void *cls, const char *gns_typename)
 {
   unsigned int i;
 
   i = 0;
   while ((NULL != gns_name_map[i].name) &&
-         (0 != strcasecmp(gns_typename, gns_name_map[i].name)))
+         (0 != strcasecmp (gns_typename, gns_name_map[i].name)))
     i++;
   return gns_name_map[i].number;
 }
@@ -334,7 +335,7 @@ gns_typename_to_number(void *cls, const char *gns_typename)
  * @return corresponding typestring, NULL on error
  */
 static const char *
-gns_number_to_typename(void *cls, uint32_t type)
+gns_number_to_typename (void *cls, uint32_t type)
 {
   unsigned int i;
 
@@ -352,11 +353,11 @@ gns_number_to_typename(void *cls, uint32_t type)
  * @return the exported block API
  */
 void *
-libgnunet_plugin_gnsrecord_gns_init(void *cls)
+libgnunet_plugin_gnsrecord_gns_init (void *cls)
 {
   struct GNUNET_GNSRECORD_PluginFunctions *api;
 
-  api = GNUNET_new(struct GNUNET_GNSRECORD_PluginFunctions);
+  api = GNUNET_new (struct GNUNET_GNSRECORD_PluginFunctions);
   api->value_to_string = &gns_value_to_string;
   api->string_to_value = &gns_string_to_value;
   api->typename_to_number = &gns_typename_to_number;
@@ -372,11 +373,11 @@ libgnunet_plugin_gnsrecord_gns_init(void *cls)
  * @return NULL
  */
 void *
-libgnunet_plugin_gnsrecord_gns_done(void *cls)
+libgnunet_plugin_gnsrecord_gns_done (void *cls)
 {
   struct GNUNET_GNSRECORD_PluginFunctions *api = cls;
 
-  GNUNET_free(api);
+  GNUNET_free (api);
   return NULL;
 }