global reindent, now with uncrustify hook enabled

3 files changed, 177 insertions, 172 deletions

diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c
index 43fc030b9..beae4d15e 100644
--- a/src/gns/nss/nss_gns.c
+++ b/src/gns/nss/nss_gns.c
@@ -37,9 +37,9 @@
 
 /** macro to align idx to 32bit boundary */
 #define ALIGN(idx) do { \
-      if (idx % sizeof(void*)) \
+    if (idx % sizeof(void*)) \
       idx += (sizeof(void*) - idx % sizeof(void*)); /* Align on 32 bit boundary */ \
-  } while (0)
+} while (0)
 
 
 /**
@@ -55,13 +55,13 @@
  * @return a nss_status code
  */
 enum nss_status
-_nss_gns_gethostbyname2_r(const char *name,
-                          int af,
-                          struct hostent *result,
-                          char *buffer,
-                          size_t buflen,
-                          int *errnop,
-                          int *h_errnop)
+_nss_gns_gethostbyname2_r (const char *name,
+                           int af,
+                           struct hostent *result,
+                           char *buffer,
+                           size_t buflen,
+                           int *errnop,
+                           int *h_errnop)
 {
   struct userdata u;
   enum nss_status status = NSS_STATUS_UNAVAIL;
@@ -86,97 +86,98 @@ _nss_gns_gethostbyname2_r(const char *name,
   if ((af != AF_INET) &&
       (af != AF_INET6))
 #endif
-    {
-      *errnop = EINVAL;
-      *h_errnop = NO_RECOVERY;
+  {
+    *errnop = EINVAL;
+    *h_errnop = NO_RECOVERY;
 
-      goto finish;
-    }
+    goto finish;
+  }
 
-  address_length = (af == AF_INET) ? sizeof(ipv4_address_t) : sizeof(ipv6_address_t);
+  address_length = (af == AF_INET) ? sizeof(ipv4_address_t) :
+                   sizeof(ipv6_address_t);
   if (buflen <
-      sizeof(char*) +     /* alias names */
-      strlen(name) + 1)
-    { /* official name */
-      *errnop = ERANGE;
-      *h_errnop = NO_RECOVERY;
-      status = NSS_STATUS_TRYAGAIN;
-
-      goto finish;
-    }
+      sizeof(char*)       /* alias names */
+      + strlen (name) + 1)
+  {   /* official name */
+    *errnop = ERANGE;
+    *h_errnop = NO_RECOVERY;
+    status = NSS_STATUS_TRYAGAIN;
+
+    goto finish;
+  }
   u.count = 0;
   u.data_len = 0;
-  i = gns_resolve_name(af,
-                       name,
-                       &u);
+  i = gns_resolve_name (af,
+                        name,
+                        &u);
   if (-1 == i)
-    {
-      *errnop = errno;
-      status = NSS_STATUS_UNAVAIL;
-      *h_errnop = NO_RECOVERY;
-      goto finish;
-    }
+  {
+    *errnop = errno;
+    status = NSS_STATUS_UNAVAIL;
+    *h_errnop = NO_RECOVERY;
+    goto finish;
+  }
   if (-2 == i)
-    {
-      *errnop = ENOENT;
-      *h_errnop = NO_RECOVERY;
-      status = NSS_STATUS_UNAVAIL;
-      goto finish;
-    }
+  {
+    *errnop = ENOENT;
+    *h_errnop = NO_RECOVERY;
+    status = NSS_STATUS_UNAVAIL;
+    goto finish;
+  }
   if (-3 == i)
-    {
-      *errnop = ETIMEDOUT;
-      *h_errnop = HOST_NOT_FOUND;
-      status = NSS_STATUS_NOTFOUND;
-      goto finish;
-    }
+  {
+    *errnop = ETIMEDOUT;
+    *h_errnop = HOST_NOT_FOUND;
+    status = NSS_STATUS_NOTFOUND;
+    goto finish;
+  }
   if (0 == u.count)
-    {
-      *errnop = 0; /* success */
-      *h_errnop = NO_DATA; /* success */
-      status = NSS_STATUS_NOTFOUND;
-      goto finish;
-    }
+  {
+    *errnop = 0;   /* success */
+    *h_errnop = NO_DATA;   /* success */
+    status = NSS_STATUS_NOTFOUND;
+    goto finish;
+  }
   /* Alias names */
-  *((char**)buffer) = NULL;
-  result->h_aliases = (char**)buffer;
+  *((char**) buffer) = NULL;
+  result->h_aliases = (char**) buffer;
   idx = sizeof(char*);
 
   /* Official name */
-  strcpy(buffer + idx,
-         name);
+  strcpy (buffer + idx,
+          name);
   result->h_name = buffer + idx;
-  idx += strlen(name) + 1;
+  idx += strlen (name) + 1;
 
-  ALIGN(idx);
+  ALIGN (idx);
 
   result->h_addrtype = af;
   result->h_length = address_length;
 
   /* Check if there's enough space for the addresses */
   if (buflen < idx + u.data_len + sizeof(char*) * (u.count + 1))
-    {
-      *errnop = ERANGE;
-      *h_errnop = NO_RECOVERY;
-      status = NSS_STATUS_TRYAGAIN;
-      goto finish;
-    }
+  {
+    *errnop = ERANGE;
+    *h_errnop = NO_RECOVERY;
+    status = NSS_STATUS_TRYAGAIN;
+    goto finish;
+  }
   /* Addresses */
   astart = idx;
   l = u.count * address_length;
   if (0 != l)
-    memcpy(buffer + astart,
-           &u.data,
-           l);
+    memcpy (buffer + astart,
+            &u.data,
+            l);
   /* address_length is a multiple of 32bits, so idx is still aligned
    * correctly */
   idx += l;
 
   /* Address array address_length is always a multiple of 32bits */
   for (i = 0; i < u.count; i++)
-    ((char**)(buffer + idx))[i] = buffer + astart + address_length * i;
-  ((char**)(buffer + idx))[i] = NULL;
-  result->h_addr_list = (char**)(buffer + idx);
+    ((char**) (buffer + idx))[i] = buffer + astart + address_length * i;
+  ((char**) (buffer + idx))[i] = NULL;
+  result->h_addr_list = (char**) (buffer + idx);
 
   status = NSS_STATUS_SUCCESS;
 
@@ -197,20 +198,20 @@ finish:
  * @return a nss_status code
  */
 enum nss_status
-_nss_gns_gethostbyname_r(const char *name,
-                         struct hostent *result,
-                         char *buffer,
-                         size_t buflen,
-                         int *errnop,
-                         int *h_errnop)
+_nss_gns_gethostbyname_r (const char *name,
+                          struct hostent *result,
+                          char *buffer,
+                          size_t buflen,
+                          int *errnop,
+                          int *h_errnop)
 {
-  return _nss_gns_gethostbyname2_r(name,
-                                   AF_UNSPEC,
-                                   result,
-                                   buffer,
-                                   buflen,
-                                   errnop,
-                                   h_errnop);
+  return _nss_gns_gethostbyname2_r (name,
+                                    AF_UNSPEC,
+                                    result,
+                                    buffer,
+                                    buflen,
+                                    errnop,
+                                    h_errnop);
 }
 
 
@@ -229,21 +230,21 @@ _nss_gns_gethostbyname_r(const char *name,
  * @return NSS_STATUS_UNAVAIL
  */
 enum nss_status
-_nss_gns_gethostbyaddr_r(const void* addr,
-                         int len,
-                         int af,
-                         struct hostent *result,
-                         char *buffer,
-                         size_t buflen,
-                         int *errnop,
-                         int *h_errnop)
+_nss_gns_gethostbyaddr_r (const void*addr,
+                          int len,
+                          int af,
+                          struct hostent *result,
+                          char *buffer,
+                          size_t buflen,
+                          int *errnop,
+                          int *h_errnop)
 {
-  (void)addr;
-  (void)len;
-  (void)af;
-  (void)result;
-  (void)buffer;
-  (void)buflen;
+  (void) addr;
+  (void) len;
+  (void) af;
+  (void) result;
+  (void) buffer;
+  (void) buflen;
   *errnop = EINVAL;
   *h_errnop = NO_RECOVERY;
   /* NOTE we allow to leak this into DNS so no NOTFOUND */
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c
index 8af618618..fb431919b 100644
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/gns/nss/nss_gns_query.c
@@ -33,12 +33,12 @@
 #define TIMEOUT "5s"
 
 static void
-kwait(pid_t chld)
+kwait (pid_t chld)
 {
   int ret;
 
-  kill(chld, SIGKILL);
-  waitpid(chld, &ret, 0);
+  kill (chld, SIGKILL);
+  waitpid (chld, &ret, 0);
 }
 
 
@@ -55,7 +55,7 @@ kwait(pid_t chld)
  *          else 0
  */
 int
-gns_resolve_name(int af, const char *name, struct userdata *u)
+gns_resolve_name (int af, const char *name, struct userdata *u)
 {
   FILE *p;
   char line[128];
@@ -63,85 +63,85 @@ gns_resolve_name(int af, const char *name, struct userdata *u)
   int out[2];
   pid_t pid;
 
-  if (0 != pipe(out))
+  if (0 != pipe (out))
     return -1;
-  pid = fork();
+  pid = fork ();
   if (-1 == pid)
     return -1;
   if (0 == pid)
-    {
-      char *argv[] = { "gnunet-gns",
-                       "-r",
-                       "-t",
-                       (AF_INET6 == af) ? "AAAA" : "A",
-                       "-u",
-                       (char *)name,
-                       "-T",
-                       TIMEOUT,
-                       NULL };
+  {
+    char *argv[] = { "gnunet-gns",
+                     "-r",
+                     "-t",
+                     (AF_INET6 == af) ? "AAAA" : "A",
+                     "-u",
+                     (char *) name,
+                     "-T",
+                     TIMEOUT,
+                     NULL };
 
-      (void)close(STDOUT_FILENO);
-      if ((0 != close(out[0])) ||
-          (STDOUT_FILENO != dup2(out[1], STDOUT_FILENO)))
-        _exit(1);
-      (void)execvp("gnunet-gns", argv);
-      _exit(1);
-    }
-  (void)close(out[1]);
-  p = fdopen(out[0], "r");
+    (void) close (STDOUT_FILENO);
+    if ((0 != close (out[0])) ||
+        (STDOUT_FILENO != dup2 (out[1], STDOUT_FILENO)))
+      _exit (1);
+    (void) execvp ("gnunet-gns", argv);
+    _exit (1);
+  }
+  (void) close (out[1]);
+  p = fdopen (out[0], "r");
   if (NULL == p)
+  {
+    kwait (pid);
+    return -1;
+  }
+  while (NULL != fgets (line, sizeof(line), p))
+  {
+    if (u->count >= MAX_ENTRIES)
+      break;
+    if (line[strlen (line) - 1] == '\n')
     {
-      kwait(pid);
-      return -1;
-    }
-  while (NULL != fgets(line, sizeof(line), p))
-    {
-      if (u->count >= MAX_ENTRIES)
-        break;
-      if (line[strlen(line) - 1] == '\n')
+      line[strlen (line) - 1] = '\0';
+      if (AF_INET == af)
+      {
+        if (inet_pton (af, line, &u->data.ipv4[u->count]))
+        {
+          u->count++;
+          u->data_len += sizeof(ipv4_address_t);
+        }
+        else
+        {
+          (void) fclose (p);
+          kwait (pid);
+          errno = EINVAL;
+          return -1;
+        }
+      }
+      else if (AF_INET6 == af)
+      {
+        if (inet_pton (af, line, &u->data.ipv6[u->count]))
+        {
+          u->count++;
+          u->data_len += sizeof(ipv6_address_t);
+        }
+        else
         {
-          line[strlen(line) - 1] = '\0';
-          if (AF_INET == af)
-            {
-              if (inet_pton(af, line, &u->data.ipv4[u->count]))
-                {
-                  u->count++;
-                  u->data_len += sizeof(ipv4_address_t);
-                }
-              else
-                {
-                  (void)fclose(p);
-                  kwait(pid);
-                  errno = EINVAL;
-                  return -1;
-                }
-            }
-          else if (AF_INET6 == af)
-            {
-              if (inet_pton(af, line, &u->data.ipv6[u->count]))
-                {
-                  u->count++;
-                  u->data_len += sizeof(ipv6_address_t);
-                }
-              else
-                {
-                  (void)fclose(p);
-                  kwait(pid);
-                  errno = EINVAL;
-                  return -1;
-                }
-            }
+          (void) fclose (p);
+          kwait (pid);
+          errno = EINVAL;
+          return -1;
         }
+      }
     }
-  (void)fclose(p);
-  waitpid(pid, &ret, 0);
-  if (!WIFEXITED(ret))
+  }
+  (void) fclose (p);
+  waitpid (pid, &ret, 0);
+  if (! WIFEXITED (ret))
     return -1;
-  if (4 == WEXITSTATUS(ret))
+  if (4 == WEXITSTATUS (ret))
     return -2; /* not for GNS */
   if (3 == ret)
     return -3; /* timeout -> not found */
-  if ((2 == WEXITSTATUS(ret)) || (1 == WEXITSTATUS(ret)))
+  if ((2 == WEXITSTATUS (ret)) || (1 == WEXITSTATUS (ret)))
     return -2; /* launch failure -> service unavailable */
   return 0;
 }
diff --git a/src/gns/nss/nss_gns_query.h b/src/gns/nss/nss_gns_query.h
index 1901dd6c4..43bf21646 100644
--- a/src/gns/nss/nss_gns_query.h
+++ b/src/gns/nss/nss_gns_query.h
@@ -28,20 +28,24 @@
 /* Maximum number of entries to return */
 #define MAX_ENTRIES 16
 
-typedef struct {
+typedef struct
+{
   uint32_t address;
 } ipv4_address_t;
 
 
-typedef struct {
+typedef struct
+{
   uint8_t address[16];
 } ipv6_address_t;
 
 
-struct userdata {
+struct userdata
+{
   int count;
   int data_len; /* only valid when doing reverse lookup */
-  union  {
+  union
+  {
     ipv4_address_t ipv4[MAX_ENTRIES];
     ipv6_address_t ipv6[MAX_ENTRIES];
     char *name[MAX_ENTRIES];
@@ -62,8 +66,8 @@ struct userdata {
  *          else 0
  */
 int
-gns_resolve_name(int af,
-                 const char *name,
-                 struct userdata *userdata);
+gns_resolve_name (int af,
+                  const char *name,
+                  struct userdata *userdata);
 
 #endif