indentation

8 files changed, 79 insertions, 64 deletions

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 6d44d84c4..9c3a65450 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -582,9 +582,11 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
       GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
                                     &neighbour_timeout_task, n);
   connect_msg.header.size = htons (sizeof (struct SessionConnectMessage));
-  connect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT);
+  connect_msg.header.type =
+      htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT);
   connect_msg.reserved = htonl (0);
-  connect_msg.timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
+  connect_msg.timestamp =
+      GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
   GST_neighbours_send (peer, &connect_msg, sizeof (connect_msg),
                        GNUNET_TIME_UNIT_FOREVER_REL, NULL, NULL);
 }
diff --git a/src/transport/gnunet-transport-wlan-helper.c b/src/transport/gnunet-transport-wlan-helper.c
index 74632e617..7df94b68b 100644
--- a/src/transport/gnunet-transport-wlan-helper.c
+++ b/src/transport/gnunet-transport-wlan-helper.c
@@ -1026,4 +1026,3 @@ getChannelFromFrequency (int frequency)
   else
     return -1;
 }
-
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index c012e950c..6d06b1af1 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -1905,7 +1905,7 @@ wlan_plugin_send (void *cls, const struct GNUNET_PeerIdentity *target,
                    session, newmsg->message_size);
 #endif
 #if DEBUG_wlan_msg_dump
-    hexdump(msgbuf,GNUNET_MIN(msgbuf_size, 256));
+  hexdump (msgbuf, GNUNET_MIN (msgbuf_size, 256));
 #endif
   //queue session
   queue_session (plugin, session);
@@ -2239,7 +2239,8 @@ wlan_data_message_handler (void *cls, const struct GNUNET_MessageHeader *hdr)
   else
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, PLUGIN_LOG_NAME,
-                     "wlan_data_message_handler got wrong message type: %u\n", ntohs (hdr->size));
+                     "wlan_data_message_handler got wrong message type: %u\n",
+                     ntohs (hdr->size));
     return;
   }
 }
@@ -2665,12 +2666,11 @@ wlan_process_helper (void *cls, void *client,
 #if DEBUG_wlan
     GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME,
                      "Func wlan_process_helper got unknown message with number %u, size %u\n",
-                     ntohs (hdr->type),
-                     ntohs (hdr->size));
+                     ntohs (hdr->type), ntohs (hdr->size));
 
 #endif
 #if DEBUG_wlan_msg_dump
-    hexdump(hdr,GNUNET_MIN(ntohs (hdr->size), 256));
+    hexdump (hdr, GNUNET_MIN (ntohs (hdr->size), 256));
 #endif
     GNUNET_break (0);
     return;
@@ -2754,25 +2754,25 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin, int testmode)
                      filenamehw, plugin->interface, testmode);
 #endif
 
-    if (GNUNET_OS_check_helper_binary(filenamehw) == GNUNET_YES)
-      {
+    if (GNUNET_OS_check_helper_binary (filenamehw) == GNUNET_YES)
+    {
       plugin->server_proc =
-              GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
-                                       filenamehw, filenamehw, plugin->interface,
-                                       NULL);
-      }
-    else if (GNUNET_OS_check_helper_binary(filenamehw) == GNUNET_NO)
-      {
-        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
-                                 "gnunet-transport-wlan-helper is not suid, please change it or look at the doku\n");
-        GNUNET_break(0);
-      }
+          GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
+                                   filenamehw, filenamehw, plugin->interface,
+                                   NULL);
+    }
+    else if (GNUNET_OS_check_helper_binary (filenamehw) == GNUNET_NO)
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
+                       "gnunet-transport-wlan-helper is not suid, please change it or look at the doku\n");
+      GNUNET_break (0);
+    }
     else
-      {
-        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
-                                 "gnunet-transport-wlan-helper not found, please look if it exists and is the $PATH variable!\n");
-        GNUNET_break(0);
-      }
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
+                       "gnunet-transport-wlan-helper not found, please look if it exists and is the $PATH variable!\n");
+      GNUNET_break (0);
+    }
 
   }
   else if (testmode == 1)
@@ -2784,18 +2784,19 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin, int testmode)
                      filenameloopback, plugin->interface, testmode);
 #endif
 
-    if (GNUNET_OS_check_helper_binary(filenameloopback) != GNUNET_SYSERR)
-      {
+    if (GNUNET_OS_check_helper_binary (filenameloopback) != GNUNET_SYSERR)
+    {
       plugin->server_proc =
-        GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
-                                 filenameloopback, filenameloopback, "1", NULL);
-      }
+          GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
+                                   filenameloopback, filenameloopback, "1",
+                                   NULL);
+    }
     else
-      {
-        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
-                           "gnunet-transport-wlan-helper-dummy not found, please look if it exists and is the $PATH variable!\n");
-        GNUNET_break(0);
-      }
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
+                       "gnunet-transport-wlan-helper-dummy not found, please look if it exists and is the $PATH variable!\n");
+      GNUNET_break (0);
+    }
   }
   else if (testmode == 2)
   {
@@ -2804,18 +2805,19 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin, int testmode)
                      "Starting gnunet-wlan-helper loopback 2 process cmd: %s %s %i\n",
                      filenameloopback, plugin->interface, testmode);
 #endif
-    if (GNUNET_OS_check_helper_binary(filenameloopback) != GNUNET_SYSERR)
-      {
-        plugin->server_proc =
-        GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
-                                 filenameloopback, filenameloopback, "2", NULL);
-      }
+    if (GNUNET_OS_check_helper_binary (filenameloopback) != GNUNET_SYSERR)
+    {
+      plugin->server_proc =
+          GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
+                                   filenameloopback, filenameloopback, "2",
+                                   NULL);
+    }
     else
-      {
-        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
-                             "gnunet-transport-wlan-helper-dummy not found, please look if it exists and is in the $PATH variable!\n");
-        GNUNET_break(0);
-      }
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
+                       "gnunet-transport-wlan-helper-dummy not found, please look if it exists and is in the $PATH variable!\n");
+      GNUNET_break (0);
+    }
   }
   if (plugin->server_proc == NULL)
   {
diff --git a/src/transport/test_plugin_transport_wlan_dummy.c b/src/transport/test_plugin_transport_wlan_dummy.c
index 077fdac29..c8d9ea21b 100644
--- a/src/transport/test_plugin_transport_wlan_dummy.c
+++ b/src/transport/test_plugin_transport_wlan_dummy.c
@@ -163,13 +163,13 @@ testmode (int argc, char *argv[])
     erg = mkfifo (FIFO_FILE1, 0666);
     if (0 != erg)
     {
-      fprintf (stderr, "Error at mkfifo1: %s\n", strerror(errno));
+      fprintf (stderr, "Error at mkfifo1: %s\n", strerror (errno));
       //exit(1);
     }
     erg = mkfifo (FIFO_FILE2, 0666);
     if (0 != erg)
     {
-      fprintf (stderr, "Error at mkfifo2: %s\n", strerror(errno));
+      fprintf (stderr, "Error at mkfifo2: %s\n", strerror (errno));
       //exit(1);
     }
 
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c
index 0dc6c2a86..9e7bdb9b6 100644
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -284,6 +284,7 @@ main (int argc, char *argv[])
 {
   int ret = 0;
   int nat_res;
+
   test_plugin = NULL;
 
   GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
@@ -299,8 +300,9 @@ main (int argc, char *argv[])
 #endif
                     NULL);
 
-  if ((test_plugin != NULL) && ((strcmp (test_plugin, "tcp_nat") == 0) ||
-      (strcmp (test_plugin, "udp_nat") == 0)))
+  if ((test_plugin != NULL) &&
+      ((strcmp (test_plugin, "tcp_nat") == 0) ||
+       (strcmp (test_plugin, "udp_nat") == 0)))
   {
     nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
     if (GNUNET_NO == nat_res)
@@ -329,13 +331,17 @@ main (int argc, char *argv[])
   struct rlimit r_file_old;
   struct rlimit r_file_new;
   int res;
-  res = getrlimit(RLIMIT_NOFILE, &r_file_old);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Maximum number of open files was: %u/%u\n", r_file_old.rlim_cur, r_file_old.rlim_max);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Setting maximum number of open files to: %u\n", MAX_FILES);
+  res = getrlimit (RLIMIT_NOFILE, &r_file_old);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Maximum number of open files was: %u/%u\n", r_file_old.rlim_cur,
+              r_file_old.rlim_max);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Setting maximum number of open files to: %u\n", MAX_FILES);
   r_file_new.rlim_cur = MAX_FILES;
   r_file_new.rlim_max = r_file_old.rlim_max;
-  res = setrlimit(RLIMIT_NOFILE, &r_file_new);
+  res = setrlimit (RLIMIT_NOFILE, &r_file_new);
 
   if (res != 0)
   {
@@ -360,8 +366,9 @@ main (int argc, char *argv[])
   GNUNET_free (test_name);
 
 #if HAVE_SETRLIMIT
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Restoring previous value maximum number of open files\n");
-  res = setrlimit(RLIMIT_NOFILE, &r_file_old);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Restoring previous value maximum number of open files\n");
+  res = setrlimit (RLIMIT_NOFILE, &r_file_old);
   if (res != 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Restoring limit failed!\n");
diff --git a/src/transport/transport_api_address_lookup.c b/src/transport/transport_api_address_lookup.c
index a760f4775..968a4324f 100644
--- a/src/transport/transport_api_address_lookup.c
+++ b/src/transport/transport_api_address_lookup.c
@@ -140,8 +140,8 @@ GNUNET_TRANSPORT_address_lookup (const struct GNUNET_CONFIGURATION_Handle *cfg,
     return NULL;
   }
   client = GNUNET_CLIENT_connect ("transport", cfg);
-  if (client == NULL)    
-    return NULL;  
+  if (client == NULL)
+    return NULL;
   msg = GNUNET_malloc (len);
   msg->header.size = htons (len);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_LOOKUP);
@@ -172,7 +172,9 @@ GNUNET_TRANSPORT_address_lookup (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param alc handle for the request to cancel
  */
 void
-GNUNET_TRANSPORT_address_lookup_cancel (struct GNUNET_TRANSPORT_AddressLookupContext *alc)
+GNUNET_TRANSPORT_address_lookup_cancel (struct
+                                        GNUNET_TRANSPORT_AddressLookupContext
+                                        *alc)
 {
   GNUNET_CLIENT_disconnect (alc->client, GNUNET_NO);
   GNUNET_free (alc);
diff --git a/src/transport/transport_api_peer_address_lookup.c b/src/transport/transport_api_peer_address_lookup.c
index 83ed074a3..a564058ce 100644
--- a/src/transport/transport_api_peer_address_lookup.c
+++ b/src/transport/transport_api_peer_address_lookup.c
@@ -141,12 +141,13 @@ GNUNET_TRANSPORT_peer_address_lookup (const struct GNUNET_CONFIGURATION_Handle
 
   client = GNUNET_CLIENT_connect ("transport", cfg);
   if (client == NULL)
-    return NULL;  
+    return NULL;
   msg.header.size = htons (sizeof (struct PeerAddressLookupMessage));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP);
   msg.timeout = GNUNET_TIME_relative_hton (timeout);
   memcpy (&msg.peer, peer, sizeof (struct GNUNET_PeerIdentity));
-  alc = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PeerAddressLookupContext));
+  alc =
+      GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PeerAddressLookupContext));
   alc->cb = peer_address_callback;
   alc->cb_cls = peer_address_callback_cls;
   alc->timeout = GNUNET_TIME_relative_to_absolute (timeout);
@@ -166,7 +167,9 @@ GNUNET_TRANSPORT_peer_address_lookup (const struct GNUNET_CONFIGURATION_Handle
  * @param alc handle for the request to cancel
  */
 void
-GNUNET_TRANSPORT_peer_address_lookup_cancel (struct GNUNET_TRANSPORT_PeerAddressLookupContext *alc)
+GNUNET_TRANSPORT_peer_address_lookup_cancel (struct
+                                             GNUNET_TRANSPORT_PeerAddressLookupContext
+                                             *alc)
 {
   GNUNET_CLIENT_disconnect (alc->client, GNUNET_NO);
   GNUNET_free (alc);
diff --git a/src/transport/wlan/helper_common.c b/src/transport/wlan/helper_common.c
index 6a7a5da09..8e1c59421 100644
--- a/src/transport/wlan/helper_common.c
+++ b/src/transport/wlan/helper_common.c
@@ -34,12 +34,12 @@
  * @return number of bytes written
  */
 int
-send_mac_to_plugin (char *buffer, struct MacAddress * mac)
+send_mac_to_plugin (char *buffer, struct MacAddress *mac)
 {
 
   struct Wlan_Helper_Control_Message macmsg;
 
-  memcpy (&macmsg.mac,(char *) mac, sizeof (struct MacAddress));
+  memcpy (&macmsg.mac, (char *) mac, sizeof (struct MacAddress));
   macmsg.hdr.size = htons (sizeof (struct Wlan_Helper_Control_Message));
   macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);