From a3aecc1584246fef20413c9b4a6097f2a9f3e64b Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 20 Jul 2012 20:18:49 +0000
Subject: [PATCH] -cleanup

---
 src/include/gnunet_gns_service.h | 39 +++++++++++++++++---------------
 src/include/gnunet_network_lib.h |  2 +-
 src/util/os_installation.c       | 34 ++++++++++++----------------
 3 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index 618d3c2c2..5eaf8b058 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -116,6 +116,7 @@ enum GNUNET_GNS_RecordType
   GNUNET_GNS_RECORD_REV  = GNUNET_NAMESTORE_TYPE_REV
 };
 
+
 /**
  * Initialize the connection with the GNS service.
  *
@@ -169,12 +170,13 @@ typedef void (*GNUNET_GNS_LookupResultProcessor) (void *cls,
  */
 struct GNUNET_GNS_LookupRequest*
 GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
-                         const char * name,
-                         enum GNUNET_GNS_RecordType type,
-                         int only_cached,
-                         struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
-                         GNUNET_GNS_LookupResultProcessor proc,
-                         void *proc_cls);
+		   const char * name,
+		   enum GNUNET_GNS_RecordType type,
+		   int only_cached,
+		   struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+		   GNUNET_GNS_LookupResultProcessor proc,
+		   void *proc_cls);
+
 
 /**
  * Perform an asynchronous lookup operation on the GNS
@@ -193,13 +195,13 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
  */
 struct GNUNET_GNS_LookupRequest*
 GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
-                         const char * name,
-                         struct GNUNET_CRYPTO_ShortHashCode *zone,
-                         enum GNUNET_GNS_RecordType type,
-                         int only_cached,
-                         struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
-                         GNUNET_GNS_LookupResultProcessor proc,
-                         void *proc_cls);
+			const char * name,
+			struct GNUNET_CRYPTO_ShortHashCode *zone,
+			enum GNUNET_GNS_RecordType type,
+			int only_cached,
+			struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+			GNUNET_GNS_LookupResultProcessor proc,
+			void *proc_cls);
 
 
 /**
@@ -221,7 +223,7 @@ GNUNET_GNS_cancel_lookup_request (struct GNUNET_GNS_LookupRequest *lr);
  * @param short_name the shortened name or NULL if no result
  */
 typedef void (*GNUNET_GNS_ShortenResultProcessor) (void *cls,
-                                        const char* short_name);
+						   const char* short_name);
 
 
 /**
@@ -274,6 +276,7 @@ GNUNET_GNS_shorten_zone (struct GNUNET_GNS_Handle *handle,
 void
 GNUNET_GNS_cancel_shorten_request (struct GNUNET_GNS_ShortenRequest *sr);
 
+
 /* *************** Standard API: get authority ******************* */
 
 
@@ -285,7 +288,7 @@ GNUNET_GNS_cancel_shorten_request (struct GNUNET_GNS_ShortenRequest *sr);
  * @param auth_name the name of the auhtority or NULL
  */
 typedef void (*GNUNET_GNS_GetAuthResultProcessor) (void *cls,
-                                        const char* short_name);
+						   const char* short_name);
 
 
 /**
@@ -299,9 +302,9 @@ typedef void (*GNUNET_GNS_GetAuthResultProcessor) (void *cls,
  */
 struct GNUNET_GNS_GetAuthRequest*
 GNUNET_GNS_get_authority (struct GNUNET_GNS_Handle *handle,
-                    const char * name,
-                    GNUNET_GNS_GetAuthResultProcessor proc,
-                    void *proc_cls);
+			  const char * name,
+			  GNUNET_GNS_GetAuthResultProcessor proc,
+			  void *proc_cls);
 
 
 /**
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 762e2faca..06a5ce903 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -197,7 +197,7 @@ GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle
 ssize_t
 GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc,
                                 void *buffer, size_t length,
-                                struct sockaddr *src_addr, socklen_t * addrlen);
+                                struct sockaddr *src_addr, socklen_t *addrlen);
 
 
 /**
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index c52628dcd..1e51c1327 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -194,29 +194,26 @@ get_path_from_dyld_image ()
   const char *path;
   char *p;
   char *s;
-  int i;
+  unsigned int i;
   int c;
 
-  p = NULL;
   c = _dyld_image_count ();
   for (i = 0; i < c; i++)
   {
-    if (_dyld_get_image_header (i) == &_mh_dylib_header)
-    {
-      path = _dyld_get_image_name (i);
-      if ( (NULL != path) && (strlen (path) > 0) )
-      {
-        p = GNUNET_strdup (path);
-        s = p + strlen (p);
-        while ((s > p) && ('/' != *s))
-          s--;
-        s++;
-        *s = '\0';
-      }
-      break;
-    }
+    if (_dyld_get_image_header (i) != &_mh_dylib_header)
+      continue;
+    path = _dyld_get_image_name (i);
+    if ( (NULL == path) || (0 == strlen (path)) )
+      continue;
+    p = GNUNET_strdup (path);
+    s = p + strlen (p);
+    while ((s > p) && ('/' != *s))
+      s--;
+    s++;
+    *s = '\0';
+    return p;
   }
-  return p;
+  return NULL;
 }
 #endif
 
@@ -237,8 +234,7 @@ get_path_from_PATH (const char *binary)
   char *buf;
   const char *p;
 
-  p = getenv ("PATH");
-  if (NULL == p)
+  if (NULL == (p = getenv ("PATH")))
     return NULL;
 #if WINDOWS
   /* On W32 look in CWD first. */
-- 
2.25.1