curly wars / auto-indentation

1 files changed, 179 insertions, 186 deletions

diff --git a/src/util/os_network.c b/src/util/os_network.c
index 2835e6193..70d143ba1 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -43,7 +43,7 @@
  */
 void
 GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
-                                   void *proc_cls)
+                                   void *proc_cls)
 {
 #ifdef MINGW
   PMIB_IFTABLE pTable;
@@ -52,121 +52,118 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
   IPAddr theIP;
 
   /* Determine our external NIC  */
-  theIP = inet_addr ("192.0.34.166");   /* www.example.com */
+  theIP = inet_addr ("192.0.34.166");   /* www.example.com */
   if ((!GNGetBestInterface) ||
       (GNGetBestInterface (theIP, &dwExternalNIC) != NO_ERROR))
-    {
-      dwExternalNIC = 0;
-    }
+  {
+    dwExternalNIC = 0;
+  }
 
   /* Enumerate NICs */
   EnumNICs (&pTable, &pAddrTable);
 
   if (pTable)
+  {
+    for (dwIfIdx = 0; dwIfIdx <= pTable->dwNumEntries; dwIfIdx++)
     {
-      for (dwIfIdx = 0; dwIfIdx <= pTable->dwNumEntries; dwIfIdx++)
-        {
-          char szEntry[1001];
-          DWORD dwIP = 0;
-          PIP_ADAPTER_INFO pAdapterInfo;
-          PIP_ADAPTER_INFO pAdapter = NULL;
-          DWORD dwRetVal = 0;
-
-          /* Get IP-Address */
-          int i;
-
-          for (i = 0; i < pAddrTable->dwNumEntries; i++)
-            {
-              if (pAddrTable->table[i].dwIndex ==
-                  pTable->table[dwIfIdx].dwIndex)
-                {
-                  dwIP = pAddrTable->table[i].dwAddr;
-                  break;
-                }
-            }
-
-          if (dwIP)
-            {
-              BYTE bPhysAddr[MAXLEN_PHYSADDR];
-              char *pszIfName = NULL;
-              char dst[INET_ADDRSTRLEN];
-              struct sockaddr_in sa;
-
-              /* Get friendly interface name */
-              pAdapterInfo =
-                (IP_ADAPTER_INFO *) malloc (sizeof (IP_ADAPTER_INFO));
-              ULONG ulOutBufLen = sizeof (IP_ADAPTER_INFO);
-
-              /* Make an initial call to GetAdaptersInfo to get
-               * the necessary size into the ulOutBufLen variable */
-              if (GGetAdaptersInfo (pAdapterInfo, &ulOutBufLen) ==
-                  ERROR_BUFFER_OVERFLOW)
-                {
-                  free (pAdapterInfo);
-                  pAdapterInfo = (IP_ADAPTER_INFO *) malloc (ulOutBufLen);
-                }
-
-              if ((dwRetVal =
-                   GGetAdaptersInfo (pAdapterInfo, &ulOutBufLen)) == NO_ERROR)
-                {
-                  pAdapter = pAdapterInfo;
-                  while (pAdapter)
-                    {
-                      if (pTable->table[dwIfIdx].dwIndex == pAdapter->Index)
-                        {
-                          char szKey[251];
-                          long lLen = 250;
-
-                          sprintf (szKey,
-                                   "SYSTEM\\CurrentControlSet\\Control\\Network\\"
-                                   "{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection",
-                                   pAdapter->AdapterName);
-                          pszIfName = (char *) malloc (251);
-                          if (QueryRegistry
-                              (HKEY_LOCAL_MACHINE, szKey, "Name", pszIfName,
-                               &lLen) != ERROR_SUCCESS)
-                            {
-                              free (pszIfName);
-                              pszIfName = NULL;
-                            }
-                        }
-                      pAdapter = pAdapter->Next;
-                    }
-                }
-              free (pAdapterInfo);
-
-              /* Set entry */
-              memset (bPhysAddr, 0, MAXLEN_PHYSADDR);
-              memcpy (bPhysAddr, pTable->table[dwIfIdx].bPhysAddr,
-                      pTable->table[dwIfIdx].dwPhysAddrLen);
-
-              snprintf (szEntry, 1000, "%s (%s - %I64u)",
-                        pszIfName ? pszIfName : (char *)
-                        pTable->table[dwIfIdx].bDescr, inet_ntop (AF_INET,
-                                                                  &dwIP, dst,
-                                                                  INET_ADDRSTRLEN),
-                        *((unsigned long long *) bPhysAddr));
-              szEntry[1000] = 0;
-
-              if (pszIfName)
-                free (pszIfName);
-
-              sa.sin_family = AF_INET;
+      char szEntry[1001];
+      DWORD dwIP = 0;
+      PIP_ADAPTER_INFO pAdapterInfo;
+      PIP_ADAPTER_INFO pAdapter = NULL;
+      DWORD dwRetVal = 0;
+
+      /* Get IP-Address */
+      int i;
+
+      for (i = 0; i < pAddrTable->dwNumEntries; i++)
+      {
+        if (pAddrTable->table[i].dwIndex == pTable->table[dwIfIdx].dwIndex)
+        {
+          dwIP = pAddrTable->table[i].dwAddr;
+          break;
+        }
+      }
+
+      if (dwIP)
+      {
+        BYTE bPhysAddr[MAXLEN_PHYSADDR];
+        char *pszIfName = NULL;
+        char dst[INET_ADDRSTRLEN];
+        struct sockaddr_in sa;
+
+        /* Get friendly interface name */
+        pAdapterInfo = (IP_ADAPTER_INFO *) malloc (sizeof (IP_ADAPTER_INFO));
+        ULONG ulOutBufLen = sizeof (IP_ADAPTER_INFO);
+
+        /* Make an initial call to GetAdaptersInfo to get
+         * the necessary size into the ulOutBufLen variable */
+        if (GGetAdaptersInfo (pAdapterInfo, &ulOutBufLen) ==
+            ERROR_BUFFER_OVERFLOW)
+        {
+          free (pAdapterInfo);
+          pAdapterInfo = (IP_ADAPTER_INFO *) malloc (ulOutBufLen);
+        }
+
+        if ((dwRetVal =
+             GGetAdaptersInfo (pAdapterInfo, &ulOutBufLen)) == NO_ERROR)
+        {
+          pAdapter = pAdapterInfo;
+          while (pAdapter)
+          {
+            if (pTable->table[dwIfIdx].dwIndex == pAdapter->Index)
+            {
+              char szKey[251];
+              long lLen = 250;
+
+              sprintf (szKey,
+                       "SYSTEM\\CurrentControlSet\\Control\\Network\\"
+                       "{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection",
+                       pAdapter->AdapterName);
+              pszIfName = (char *) malloc (251);
+              if (QueryRegistry
+                  (HKEY_LOCAL_MACHINE, szKey, "Name", pszIfName,
+                   &lLen) != ERROR_SUCCESS)
+              {
+                free (pszIfName);
+                pszIfName = NULL;
+              }
+            }
+            pAdapter = pAdapter->Next;
+          }
+        }
+        free (pAdapterInfo);
+
+        /* Set entry */
+        memset (bPhysAddr, 0, MAXLEN_PHYSADDR);
+        memcpy (bPhysAddr, pTable->table[dwIfIdx].bPhysAddr,
+                pTable->table[dwIfIdx].dwPhysAddrLen);
+
+        snprintf (szEntry, 1000, "%s (%s - %I64u)",
+                  pszIfName ? pszIfName : (char *) pTable->
+                  table[dwIfIdx].bDescr, inet_ntop (AF_INET, &dwIP, dst,
+                                                    INET_ADDRSTRLEN),
+                  *((unsigned long long *) bPhysAddr));
+        szEntry[1000] = 0;
+
+        if (pszIfName)
+          free (pszIfName);
+
+        sa.sin_family = AF_INET;
 #if HAVE_SOCKADDR_IN_SIN_LEN
-              sa.sin_len = (u_char) sizeof (struct sockaddr_in);
+        sa.sin_len = (u_char) sizeof (struct sockaddr_in);
 #endif
-              sa.sin_addr.S_un.S_addr = dwIP;
-
-              if (GNUNET_OK !=
-                  proc (proc_cls, szEntry,
-                        pTable->table[dwIfIdx].dwIndex == dwExternalNIC,
-                        (const struct sockaddr *) &sa, sizeof (sa)))
-                break;
-            }
-        }
-      GlobalFree (pAddrTable);
-      GlobalFree (pTable);
+        sa.sin_addr.S_un.S_addr = dwIP;
+
+        if (GNUNET_OK !=
+            proc (proc_cls, szEntry,
+                  pTable->table[dwIfIdx].dwIndex == dwExternalNIC,
+                  (const struct sockaddr *) &sa, sizeof (sa)))
+          break;
+      }
     }
+    GlobalFree (pAddrTable);
+    GlobalFree (pTable);
+  }
 
   return;
 
@@ -177,29 +174,28 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
   socklen_t alen;
 
   if (getifaddrs (&ifa_first) == 0)
+  {
+    for (ifa_ptr = ifa_first; ifa_ptr != NULL; ifa_ptr = ifa_ptr->ifa_next)
     {
-      for (ifa_ptr = ifa_first; ifa_ptr != NULL; ifa_ptr = ifa_ptr->ifa_next)
-        {
-          if (ifa_ptr->ifa_name != NULL && ifa_ptr->ifa_addr != NULL &&
-              (ifa_ptr->ifa_flags & IFF_UP) != 0)
-            {
-              if ((ifa_ptr->ifa_addr->sa_family != AF_INET) &&
-                  (ifa_ptr->ifa_addr->sa_family != AF_INET6))
-                continue;
-              if (ifa_ptr->ifa_addr->sa_family == AF_INET)
-                alen = sizeof (struct sockaddr_in);
-              else
-                alen = sizeof (struct sockaddr_in6);
-              if (GNUNET_OK !=
-                  proc (proc_cls, ifa_ptr->ifa_name,
-                        0 == strcmp (ifa_ptr->ifa_name,
-                                     GNUNET_DEFAULT_INTERFACE),
-                        ifa_ptr->ifa_addr, alen))
-                break;
-            }
-        }
-      freeifaddrs (ifa_first);
+      if (ifa_ptr->ifa_name != NULL && ifa_ptr->ifa_addr != NULL &&
+          (ifa_ptr->ifa_flags & IFF_UP) != 0)
+      {
+        if ((ifa_ptr->ifa_addr->sa_family != AF_INET) &&
+            (ifa_ptr->ifa_addr->sa_family != AF_INET6))
+          continue;
+        if (ifa_ptr->ifa_addr->sa_family == AF_INET)
+          alen = sizeof (struct sockaddr_in);
+        else
+          alen = sizeof (struct sockaddr_in6);
+        if (GNUNET_OK !=
+            proc (proc_cls, ifa_ptr->ifa_name,
+                  0 == strcmp (ifa_ptr->ifa_name, GNUNET_DEFAULT_INTERFACE),
+                  ifa_ptr->ifa_addr, alen))
+          break;
+      }
     }
+    freeifaddrs (ifa_first);
+  }
 #else
   char line[1024];
   const char *start;
@@ -220,76 +216,73 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
   else
     f = popen ("ifconfig -a 2> /dev/null", "r");
   if (!f)
-    {
-      LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING |
-                         GNUNET_ERROR_TYPE_BULK, "popen", "ifconfig");
-      return;
-    }
+  {
+    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+                       "popen", "ifconfig");
+    return;
+  }
 
   have_ifc = GNUNET_NO;
   ifc[11] = '\0';
   while (NULL != fgets (line, sizeof (line), f))
+  {
+    if (strlen (line) == 0)
+    {
+      have_ifc = GNUNET_NO;
+      continue;
+    }
+    if (!isspace (line[0]))
+    {
+      have_ifc = (1 == SSCANF (line, "%11s", ifc)) ? GNUNET_YES : GNUNET_NO;
+      /* would end with ':' on OSX, fix it! */
+      if (ifc[strlen (ifc) - 1] == ':')
+        ifc[strlen (ifc) - 1] = '\0';
+      continue;
+    }
+    if (!have_ifc)
+      continue;                 /* strange input, hope for the best */
+    start = line;
+    while (('\0' != *start) && (isspace (*start)))
+      start++;
+    if (                        /* Linux */
+         (1 == SSCANF (start, "inet addr:%127s", addrstr)) ||
+         (1 == SSCANF (start, "inet6 addr:%127s", addrstr)) ||
+         /* Solaris, OS X */
+         (1 == SSCANF (start, "inet %127s", addrstr)) ||
+         (1 == SSCANF (start, "inet6 %127s", addrstr)))
     {
-      if (strlen (line) == 0)
-        {
-          have_ifc = GNUNET_NO;
-          continue;
-        }
-      if (!isspace (line[0]))
-        {
-          have_ifc =
-            (1 == SSCANF (line, "%11s", ifc)) ? GNUNET_YES : GNUNET_NO;
-          /* would end with ':' on OSX, fix it! */
-          if (ifc[strlen (ifc) - 1] == ':')
-            ifc[strlen (ifc) - 1] = '\0';
-          continue;
-        }
-      if (!have_ifc)
-        continue;               /* strange input, hope for the best */
-      start = line;
-      while (('\0' != *start) && (isspace (*start)))
-        start++;
-      if (                      /* Linux */
-           (1 == SSCANF (start, "inet addr:%127s", addrstr)) ||
-           (1 == SSCANF (start, "inet6 addr:%127s", addrstr)) ||
-           /* Solaris, OS X */
-           (1 == SSCANF (start, "inet %127s", addrstr)) ||
-           (1 == SSCANF (start, "inet6 %127s", addrstr)))
-        {
-          /* IPv4 */
-          if (1 == inet_pton (AF_INET, addrstr, &v4))
-            {
-              memset (&a4, 0, sizeof (a4));
-              a4.sin_family = AF_INET;
+      /* IPv4 */
+      if (1 == inet_pton (AF_INET, addrstr, &v4))
+      {
+        memset (&a4, 0, sizeof (a4));
+        a4.sin_family = AF_INET;
 #if HAVE_SOCKADDR_IN_SIN_LEN
-              a4.sin_len = (u_char) sizeof (struct sockaddr_in);
+        a4.sin_len = (u_char) sizeof (struct sockaddr_in);
 #endif
-              a4.sin_addr = v4;
-              if (GNUNET_OK !=
-                  proc (proc_cls, ifc,
-                        0 == strcmp (ifc, GNUNET_DEFAULT_INTERFACE),
-                        (const struct sockaddr *) &a4, sizeof (a4)))
-                break;
-              continue;
-            }
-          /* IPv6 */
-          if (1 == inet_pton (AF_INET6, addrstr, &v6))
-            {
-              memset (&a6, 0, sizeof (a6));
-              a6.sin6_family = AF_INET6;
+        a4.sin_addr = v4;
+        if (GNUNET_OK !=
+            proc (proc_cls, ifc, 0 == strcmp (ifc, GNUNET_DEFAULT_INTERFACE),
+                  (const struct sockaddr *) &a4, sizeof (a4)))
+          break;
+        continue;
+      }
+      /* IPv6 */
+      if (1 == inet_pton (AF_INET6, addrstr, &v6))
+      {
+        memset (&a6, 0, sizeof (a6));
+        a6.sin6_family = AF_INET6;
 #if HAVE_SOCKADDR_IN_SIN_LEN
-              a6.sin6_len = (u_char) sizeof (struct sockaddr_in6);
+        a6.sin6_len = (u_char) sizeof (struct sockaddr_in6);
 #endif
-              a6.sin6_addr = v6;
-              if (GNUNET_OK !=
-                  proc (proc_cls, ifc,
-                        0 == strcmp (ifc, GNUNET_DEFAULT_INTERFACE),
-                        (const struct sockaddr *) &a6, sizeof (a6)))
-                break;
-              continue;
-            }
-        }
+        a6.sin6_addr = v6;
+        if (GNUNET_OK !=
+            proc (proc_cls, ifc, 0 == strcmp (ifc, GNUNET_DEFAULT_INTERFACE),
+                  (const struct sockaddr *) &a6, sizeof (a6)))
+          break;
+        continue;
+      }
     }
+  }
   pclose (f);
 #endif
 }