gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r6454 - in GNUnet/src: applications/bootstrap_http applicat


From: gnunet
Subject: [GNUnet-SVN] r6454 - in GNUnet/src: applications/bootstrap_http applications/chat applications/dht/module applications/dht/tools applications/fs/ecrs applications/fs/fsui applications/fs/gap applications/fs/lib applications/fs/tools applications/hostlist applications/rpc applications/sqstore_mysql applications/sqstore_sqlite applications/vpn include transports util/network
Date: Mon, 25 Feb 2008 00:30:56 -0700 (MST)

Author: grothoff
Date: 2008-02-25 00:30:55 -0700 (Mon, 25 Feb 2008)
New Revision: 6454

Modified:
   GNUnet/src/applications/bootstrap_http/http.c
   GNUnet/src/applications/bootstrap_http/httptest.c
   GNUnet/src/applications/chat/chat.c
   GNUnet/src/applications/chat/clientapi.c
   GNUnet/src/applications/dht/module/table.c
   GNUnet/src/applications/dht/tools/dhttest.c
   GNUnet/src/applications/dht/tools/dhttest2.c
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/ecrs/search.c
   GNUnet/src/applications/fs/fsui/download.c
   GNUnet/src/applications/fs/fsui/fsui.c
   GNUnet/src/applications/fs/fsui/fsui.h
   GNUnet/src/applications/fs/fsui/search.c
   GNUnet/src/applications/fs/gap/shared.h
   GNUnet/src/applications/fs/lib/fslib.c
   GNUnet/src/applications/fs/tools/gnunet-auto-share.c
   GNUnet/src/applications/hostlist/hostlist.c
   GNUnet/src/applications/hostlist/hostlisttest.c
   GNUnet/src/applications/rpc/parameters.c
   GNUnet/src/applications/rpc/rpc.c
   GNUnet/src/applications/sqstore_mysql/mysqltest2.c
   GNUnet/src/applications/sqstore_mysql/mysqltest3.c
   GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c
   GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c
   GNUnet/src/applications/vpn/cs.c
   GNUnet/src/applications/vpn/p2p.c
   GNUnet/src/include/gnunet_ecrs_lib.h
   GNUnet/src/include/gnunet_fsui_lib.h
   GNUnet/src/include/gnunet_sqstore_service.h
   GNUnet/src/transports/common.c
   GNUnet/src/transports/http.c
   GNUnet/src/transports/ip.c
   GNUnet/src/transports/test.c
   GNUnet/src/transports/test_repeat.c
   GNUnet/src/util/network/select.c
Log:
indent

Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c       2008-02-25 07:18:01 UTC 
(rev 6453)
+++ GNUnet/src/applications/bootstrap_http/http.c       2008-02-25 07:30:55 UTC 
(rev 6454)
@@ -229,9 +229,9 @@
        i > GNUNET_TRANSPORT_PROTOCOL_NUMBER_NAT; i--)
     {
       if (transport == NULL)
-       protocols |= (1LL << i);
+        protocols |= (1LL << i);
       else if (transport->isAvailable ((unsigned short) i))
-       protocols |= (1LL << i);
+        protocols |= (1LL << i);
     }
   sprintf (purl, "%s?p=%llu", url, protocols);
   GNUNET_free (url);

Modified: GNUnet/src/applications/bootstrap_http/httptest.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/httptest.c   2008-02-25 07:18:01 UTC 
(rev 6453)
+++ GNUnet/src/applications/bootstrap_http/httptest.c   2008-02-25 07:30:55 UTC 
(rev 6454)
@@ -106,9 +106,10 @@
       p = GNUNET_thread_create (&pt, boot, 1024 * 64);
       GNUNET_thread_join (p, &unused);
       done =
-       GNUNET_plugin_resolve_function (plugin, "release_module_", GNUNET_YES);
-      if (done != NULL) 
-       done ();
+        GNUNET_plugin_resolve_function (plugin, "release_module_",
+                                        GNUNET_YES);
+      if (done != NULL)
+        done ();
     }
   GNUNET_plugin_unload (plugin);
   GNUNET_GC_free (cfg);

Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/applications/chat/chat.c 2008-02-25 07:30:55 UTC (rev 6454)
@@ -48,7 +48,7 @@
 
 };
 
-static struct GNUNET_CS_chat_client * client_list_head;
+static struct GNUNET_CS_chat_client *client_list_head;
 
 static int
 csHandleChatMSG (struct GNUNET_ClientHandle *client,
@@ -73,7 +73,7 @@
   cmsg = (CS_chat_MESSAGE *) message;
   if (ntohs (cmsg->header.size) < sizeof (CS_chat_MESSAGE))
     {
-      GNUNET_GE_BREAK(NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       return GNUNET_SYSERR;     /* invalid message */
     }
 
@@ -82,10 +82,10 @@
   nick_len = ntohl (cmsg->nick_len);
   msg_len = ntohl (cmsg->msg_len);
   room_name_len = ntohl (cmsg->room_name_len);
-  
+
   if (header_size < (nick_len + msg_len + room_name_len))
     {
-      GNUNET_GE_BREAK(NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       return GNUNET_SYSERR;     /* invalid message */
     }
 
@@ -142,7 +142,7 @@
 
 static int
 csHandleChatJoinRequest (struct GNUNET_ClientHandle *client,
-                     const GNUNET_MessageHeader * message)
+                         const GNUNET_MessageHeader * message)
 {
   const CS_chat_JOIN_MESSAGE *cmsg;
   P2P_chat_MESSAGE *pmsg;
@@ -165,11 +165,11 @@
 
   if (ntohs (cmsg->header.size) < sizeof (CS_chat_JOIN_MESSAGE))
     {
-      GNUNET_GE_BREAK(NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       return GNUNET_SYSERR;     /* invalid message */
     }
-    
 
+
   header_size = ntohs (cmsg->header.size);
   nick_len = ntohl (cmsg->nick_len);
   pubkey_len = ntohl (cmsg->pubkey_len);
@@ -177,7 +177,7 @@
 
   if (header_size < (nick_len + pubkey_len + room_name_len))
     {
-      GNUNET_GE_BREAK(NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       return GNUNET_SYSERR;     /* invalid message */
     }
 
@@ -207,16 +207,16 @@
     tempClient = tempClient->next;
   if (tempClient != NULL)
     {
-      GNUNET_GE_BREAK(NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       GNUNET_free (nick);
       GNUNET_free (client_key);
       GNUNET_free (room_name);
       GNUNET_mutex_unlock (chatMutex);
-      return GNUNET_SYSERR;      
+      return GNUNET_SYSERR;
     }
 #endif
   tempClient = GNUNET_malloc (sizeof (struct GNUNET_CS_chat_client));
-  memset(tempClient, 0, sizeof (struct GNUNET_CS_chat_client));
+  memset (tempClient, 0, sizeof (struct GNUNET_CS_chat_client));
   tempClient->next = client_list_head;
   if (client_list_head != NULL)
     client_list_head->prev = tempClient;
@@ -249,9 +249,9 @@
 chatClientExitHandler (struct GNUNET_ClientHandle *client)
 {
   int tempCount;
-  struct GNUNET_CS_chat_client * tempClient;
-  struct GNUNET_CS_chat_client * pos;
-  struct GNUNET_CS_chat_client * prev;
+  struct GNUNET_CS_chat_client *tempClient;
+  struct GNUNET_CS_chat_client *pos;
+  struct GNUNET_CS_chat_client *prev;
 
   GNUNET_GE_LOG (ectx,
                  GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
@@ -261,20 +261,20 @@
 
   pos = client_list_head;
   prev = NULL;
-  while ( (pos != NULL) && (pos->client != client) )
-       {
+  while ((pos != NULL) && (pos->client != client))
+    {
       prev = pos;
       pos = pos->next;
     }
   if (pos != NULL)
-       {
+    {
       if (prev == NULL)
-       client_list_head = pos->next;
+        client_list_head = pos->next;
       else
-       prev->next = pos->next;
+        prev->next = pos->next;
       if (pos->next != NULL)
-       pos->next->prev = pos->prev;
-      GNUNET_free(pos);
+        pos->next->prev = pos->prev;
+      GNUNET_free (pos);
     }
   /*Count the number of current clients, will be removed */
 
@@ -286,7 +286,7 @@
       tempClient = tempClient->next;
     }
   fprintf (stderr, "Number of clients currently is... %d\n", tempCount);
-  /*End of client count code*/
+  /*End of client count code */
 
   GNUNET_mutex_unlock (chatMutex);
   return;
@@ -301,7 +301,7 @@
   GNUNET_GE_ASSERT (ectx,
                     sizeof (P2P_chat_MESSAGE) == sizeof (CS_chat_MESSAGE));
   chatMutex = GNUNET_mutex_create (GNUNET_NO);
-  
+
   coreAPI = capi;
   GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
                  _("`%s' registering handlers %d and %d\n"),

Modified: GNUnet/src/applications/chat/clientapi.c
===================================================================
--- GNUnet/src/applications/chat/clientapi.c    2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/chat/clientapi.c    2008-02-25 07:30:55 UTC (rev 
6454)
@@ -33,7 +33,7 @@
 
 /**
  * Listen for incoming messages on this chat room.  When received, call the 
client callback.
- * Also, support servers going away/coming back (i.e. rejoin chat room to keep 
server state up to date)... 
+ * Also, support servers going away/coming back (i.e. rejoin chat room to keep 
server state up to date)...
  */
 static void *
 poll_thread (void *rcls)
@@ -54,76 +54,79 @@
   int disconnected;
 
   ret = GNUNET_OK;
-       disconnected = GNUNET_NO;
+  disconnected = GNUNET_NO;
   while (room->shutdown_flag != GNUNET_YES)
-  {
-       if (disconnected)
-               {
-                       GNUNET_thread_sleep(15 * GNUNET_CRON_SECONDS);
-                       if (GNUNET_client_connection_ensure_connected 
(room->sock) == GNUNET_OK)
-           {
-             /* send join! */
-             disconnected = GNUNET_NO;
-             GNUNET_CHAT_rejoin_room(room);
-             continue;
-           }
-           else
-             break;
-               }
-               
-               fprintf(stderr,"polling\n");
-    reply = NULL;
+    {
+      if (disconnected)
+        {
+          GNUNET_thread_sleep (15 * GNUNET_CRON_SECONDS);
+          if (GNUNET_client_connection_ensure_connected (room->sock) ==
+              GNUNET_OK)
+            {
+              /* send join! */
+              disconnected = GNUNET_NO;
+              GNUNET_CHAT_rejoin_room (room);
+              continue;
+            }
+          else
+            break;
+        }
 
-    if (GNUNET_OK != GNUNET_client_connection_read (room->sock, &reply))
-               {
-                 disconnected = GNUNET_YES;
-                 continue;
-               }
+      fprintf (stderr, "polling\n");
+      reply = NULL;
 
-    if ((reply->size <
-         ntohs (sizeof (GNUNET_MessageHeader) + sizeof (CS_chat_MESSAGE)))
-        || (reply->type != ntohs (GNUNET_CS_PROTO_CHAT_MSG)))
-               {
-                 GNUNET_GE_BREAK(NULL, 0);
-                 GNUNET_client_connection_close_temporarily(room->sock);
-                 disconnected = GNUNET_YES;
-                 continue;
-               }
+      if (GNUNET_OK != GNUNET_client_connection_read (room->sock, &reply))
+        {
+          disconnected = GNUNET_YES;
+          continue;
+        }
 
-    size = ntohs (reply->size);
+      if ((reply->size <
+           ntohs (sizeof (GNUNET_MessageHeader) + sizeof (CS_chat_MESSAGE)))
+          || (reply->type != ntohs (GNUNET_CS_PROTO_CHAT_MSG)))
+        {
+          GNUNET_GE_BREAK (NULL, 0);
+          GNUNET_client_connection_close_temporarily (room->sock);
+          disconnected = GNUNET_YES;
+          continue;
+        }
 
-    received_msg = (CS_chat_MESSAGE *) reply;
+      size = ntohs (reply->size);
 
-    nick_len = ntohl (received_msg->nick_len);
-    msg_len = ntohl (received_msg->msg_len);
-    /* NO NEED TO SEND ROOM! */
-    room_name_len = ntohl (received_msg->room_name_len);
+      received_msg = (CS_chat_MESSAGE *) reply;
 
-    if (size < (nick_len + msg_len + room_name_len))
-    {
-      GNUNET_GE_BREAK(NULL, 0);
-      return GNUNET_SYSERR;     /* invalid message */
-    }
+      nick_len = ntohl (received_msg->nick_len);
+      msg_len = ntohl (received_msg->msg_len);
+      /* NO NEED TO SEND ROOM! */
+      room_name_len = ntohl (received_msg->room_name_len);
 
-    nick = GNUNET_malloc (nick_len + 1);
-    message_content = GNUNET_malloc (msg_len + 1);
-    room_name = GNUNET_malloc (room_name_len + 1);
+      if (size < (nick_len + msg_len + room_name_len))
+        {
+          GNUNET_GE_BREAK (NULL, 0);
+          return GNUNET_SYSERR; /* invalid message */
+        }
 
-    /* BUFFER OVERFLOWS! */
-    memcpy (nick, &received_msg->nick[0], nick_len);
-    memcpy (message_content, &received_msg->nick[nick_len], msg_len);
-    memcpy (room_name, &received_msg->nick[nick_len + msg_len],
-            room_name_len);
+      nick = GNUNET_malloc (nick_len + 1);
+      message_content = GNUNET_malloc (msg_len + 1);
+      room_name = GNUNET_malloc (room_name_len + 1);
 
-    nick[nick_len] = '\0';
-    message_content[msg_len] = '\0';
-    room_name[room_name_len] = '\0';
+      /* BUFFER OVERFLOWS! */
+      memcpy (nick, &received_msg->nick[0], nick_len);
+      memcpy (message_content, &received_msg->nick[nick_len], msg_len);
+      memcpy (room_name, &received_msg->nick[nick_len + msg_len],
+              room_name_len);
 
-    if (GNUNET_OK != room->callback (room->callback_cls, room, nick, 
message_content,GNUNET_get_time (), 0))
-    {
-      ret = GNUNET_SYSERR;
+      nick[nick_len] = '\0';
+      message_content[msg_len] = '\0';
+      room_name[room_name_len] = '\0';
+
+      if (GNUNET_OK !=
+          room->callback (room->callback_cls, room, nick, message_content,
+                          GNUNET_get_time (), 0))
+        {
+          ret = GNUNET_SYSERR;
+        }
     }
-  }
   return NULL;
 }
 
@@ -210,7 +213,7 @@
     {
       /* ALREADY LOGGED */
       fprintf (stderr, _("Error writing to socket.\n"));
-      GNUNET_free(join_msg);
+      GNUNET_free (join_msg);
       return NULL;
     }
 
@@ -257,8 +260,10 @@
   csHdr.size = htons (sizeof (CS_chat_JOIN_MESSAGE));
   csHdr.type = htons (GNUNET_CS_PROTO_CHAT_JOIN_MSG);
 
-  GNUNET_hash (chat_room->my_public_key, sizeof (GNUNET_RSA_PublicKey), 
&hash_of_me);
-  GNUNET_hash (chat_room->room_name, strlen (chat_room->room_name), 
&hash_of_room_name);
+  GNUNET_hash (chat_room->my_public_key, sizeof (GNUNET_RSA_PublicKey),
+               &hash_of_me);
+  GNUNET_hash (chat_room->room_name, strlen (chat_room->room_name),
+               &hash_of_room_name);
 
   size_of_join =
     sizeof (CS_chat_JOIN_MESSAGE) + strlen (chat_room->nickname) +
@@ -270,10 +275,12 @@
   join_msg->room_name_len = htonl (strlen (chat_room->room_name));
 
 
-  memcpy (&join_msg->nick[0], chat_room->nickname, strlen 
(chat_room->nickname));
-  memcpy (&join_msg->nick[strlen (chat_room->nickname)], 
chat_room->my_public_key,
-          sizeof (GNUNET_RSA_PublicKey));
-  memcpy (&join_msg->nick[strlen (chat_room->nickname) + sizeof 
(GNUNET_RSA_PublicKey)],
+  memcpy (&join_msg->nick[0], chat_room->nickname,
+          strlen (chat_room->nickname));
+  memcpy (&join_msg->nick[strlen (chat_room->nickname)],
+          chat_room->my_public_key, sizeof (GNUNET_RSA_PublicKey));
+  memcpy (&join_msg->
+          nick[strlen (chat_room->nickname) + sizeof (GNUNET_RSA_PublicKey)],
           chat_room->room_name, strlen (chat_room->room_name));
 
   join_msg->header = csHdr;
@@ -282,11 +289,11 @@
   if (GNUNET_SYSERR ==
       GNUNET_client_connection_write (chat_room->sock, &join_msg->header))
     {
-      GNUNET_free(join_msg);
+      GNUNET_free (join_msg);
       return GNUNET_SYSERR;
     }
 
-  GNUNET_free (join_msg);  
+  GNUNET_free (join_msg);
   return GNUNET_OK;
 }
 
@@ -296,11 +303,11 @@
 void
 GNUNET_CHAT_leave_room (struct GNUNET_CHAT_Room *chat_room)
 {
-  void * unused;
+  void *unused;
   chat_room->shutdown_flag = GNUNET_YES;
   GNUNET_client_connection_close_forever (chat_room->sock);
-  GNUNET_thread_stop_sleep(chat_room->listen_thread);
-  GNUNET_thread_join(chat_room->listen_thread, &unused);
+  GNUNET_thread_stop_sleep (chat_room->listen_thread);
+  GNUNET_thread_join (chat_room->listen_thread, &unused);
   GNUNET_free (chat_room->nickname);
   GNUNET_free (chat_room->memberInfo);
   GNUNET_client_connection_destroy (chat_room->sock);

Modified: GNUnet/src/applications/dht/module/table.c
===================================================================
--- GNUnet/src/applications/dht/module/table.c  2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/dht/module/table.c  2008-02-25 07:30:55 UTC (rev 
6454)
@@ -272,10 +272,8 @@
   unsigned int index;
   int i;
 
-  if (0 == memcmp(peer,
-                 coreAPI->myIdentity,
-                 sizeof(GNUNET_PeerIdentity)))
-    return NULL; /* myself! */
+  if (0 == memcmp (peer, coreAPI->myIdentity, sizeof (GNUNET_PeerIdentity)))
+    return NULL;                /* myself! */
   index = get_bit_distance (&peer->hashPubKey,
                             &coreAPI->myIdentity->hashPubKey);
   i = bucketCount - 1;
@@ -283,7 +281,7 @@
     i--;
   if ((buckets[i].bstart <= index) && (buckets[i].bend >= index))
     return &buckets[i];
-  GNUNET_GE_BREAK(NULL, 0);
+  GNUNET_GE_BREAK (NULL, 0);
   return NULL;
 }
 

Modified: GNUnet/src/applications/dht/tools/dhttest.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest.c 2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/dht/tools/dhttest.c 2008-02-25 07:30:55 UTC (rev 
6454)
@@ -145,8 +145,7 @@
                                           ectx,
                                           &key,
                                           
GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
-                                         8,
-                                          value));
+                                          8, value));
       GNUNET_free (value);
     }
 

Modified: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c        2008-02-25 07:18:01 UTC 
(rev 6453)
+++ GNUnet/src/applications/dht/tools/dhttest2.c        2008-02-25 07:30:55 UTC 
(rev 6454)
@@ -160,8 +160,7 @@
                                       ectx,
                                       &key,
                                       GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
-                                      8,
-                                     value));
+                                      8, value));
   printf ("Peer1 gets key2\n");
   CHECK (1 == GNUNET_DHT_get (cfg,
                               ectx,
@@ -180,8 +179,7 @@
                                       ectx,
                                       &key,
                                       GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
-                                     8, 
-                                      value));
+                                      8, value));
   printf ("Peer2 gets key.\n");
   CHECK (1 == GNUNET_DHT_get (cfg,
                               ectx,

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/fs/ecrs/download.c  2008-02-25 07:30:55 UTC (rev 
6454)
@@ -208,7 +208,8 @@
  *     is not complete and may be resumed later.
  */
 static void
-free_request_manager (struct GNUNET_ECRS_DownloadContext *rm, int 
unlinkTreeFiles)
+free_request_manager (struct GNUNET_ECRS_DownloadContext *rm,
+                      int unlinkTreeFiles)
 {
   int i;
   char *fn;
@@ -261,7 +262,7 @@
     }
   GNUNET_free_non_null (rm->filename);
   GNUNET_free_non_null (rm->handles);
-  GNUNET_free(rm);
+  GNUNET_free (rm);
 }
 
 /**
@@ -357,14 +358,11 @@
 }
 
 static void
-signal_abort (struct GNUNET_ECRS_DownloadContext *rm,
-             const char * msg)
+signal_abort (struct GNUNET_ECRS_DownloadContext *rm, const char *msg)
 {
   rm->abortFlag = GNUNET_YES;
-  if ( (rm->head != NULL) &&
-       (rm->dpcb != NULL) )
-    rm->dpcb (rm->length+1,
-              0, 0, 0, msg, 0, rm->dpcbClosure);
+  if ((rm->head != NULL) && (rm->dpcb != NULL))
+    rm->dpcb (rm->length + 1, 0, 0, 0, msg, 0, rm->dpcbClosure);
   GNUNET_thread_stop_sleep (rm->main);
 }
 
@@ -650,9 +648,9 @@
       GNUNET_free (data);
       GNUNET_GE_BREAK (ectx, 0);
       signal_abort (rm,
-                   _("Decrypted content does not match key. "
-                     "This is either a bug or a maliciously inserted "
-                     "file. Download aborted.\n"));
+                    _("Decrypted content does not match key. "
+                      "This is either a bug or a maliciously inserted "
+                      "file. Download aborted.\n"));
       GNUNET_mutex_unlock (rm->lock);
       return GNUNET_SYSERR;
     }
@@ -754,17 +752,17 @@
  */
 struct GNUNET_ECRS_DownloadContext *
 GNUNET_ECRS_file_download_partial_start (struct GNUNET_GE_Context *ectx,
-                                        struct GNUNET_GC_Configuration *cfg,
-                                        const struct GNUNET_ECRS_URI *uri,
-                                        const char *filename,
-                                        unsigned long long offset,
-                                        unsigned long long length,
-                                        unsigned int anonymityLevel,
-                                        int no_temporaries,
-                                        GNUNET_ECRS_DownloadProgressCallback 
dpcb,
-                                        void *dpcbClosure)
+                                         struct GNUNET_GC_Configuration *cfg,
+                                         const struct GNUNET_ECRS_URI *uri,
+                                         const char *filename,
+                                         unsigned long long offset,
+                                         unsigned long long length,
+                                         unsigned int anonymityLevel,
+                                         int no_temporaries,
+                                         GNUNET_ECRS_DownloadProgressCallback
+                                         dpcb, void *dpcbClosure)
 {
-  struct GNUNET_ECRS_DownloadContext * rm;
+  struct GNUNET_ECRS_DownloadContext *rm;
   struct stat buf;
   struct Node *top;
   char *fn;
@@ -776,9 +774,8 @@
       GNUNET_GE_BREAK (ectx, 0);
       return NULL;
     }
-  rm = GNUNET_malloc(sizeof (struct GNUNET_ECRS_DownloadContext));
-  memset (rm, 0,
-         sizeof (struct GNUNET_ECRS_DownloadContext));
+  rm = GNUNET_malloc (sizeof (struct GNUNET_ECRS_DownloadContext));
+  memset (rm, 0, sizeof (struct GNUNET_ECRS_DownloadContext));
   rm->ectx = ectx;
   rm->cfg = cfg;
   rm->startTime = GNUNET_get_time ();
@@ -842,9 +839,9 @@
               fn[strlen (fn) - 1] += i;
             }
           rm->handles[i] = GNUNET_disk_file_open (ectx,
-                                                 fn,
-                                                 O_CREAT | O_RDWR,
-                                                 S_IRUSR | S_IWUSR);
+                                                  fn,
+                                                  O_CREAT | O_RDWR,
+                                                  S_IRUSR | S_IWUSR);
           GNUNET_free (fn);
           if (rm->handles[i] < 0)
             {
@@ -884,10 +881,11 @@
 }
 
 int
-GNUNET_ECRS_file_download_partial_stop (struct GNUNET_ECRS_DownloadContext * 
rm) 
+GNUNET_ECRS_file_download_partial_stop (struct GNUNET_ECRS_DownloadContext
+                                        *rm)
 {
   int ret;
-  char * rdir;
+  char *rdir;
   int len;
 
   if ((rm->head == NULL) &&
@@ -909,7 +907,8 @@
         {
           GNUNET_GE_LOG_STRERROR_FILE (rm->ectx,
                                        GNUNET_GE_WARNING | GNUNET_GE_USER |
-                                       GNUNET_GE_BULK, "unlink", rm->filename);
+                                       GNUNET_GE_BULK, "unlink",
+                                       rm->filename);
         }
       else
         {
@@ -934,8 +933,7 @@
                  __FUNCTION__, filename,
                  ret == GNUNET_OK ? "SUCCESS" : "INCOMPLETE");
 #endif
-  free_request_manager (rm,
-                        (ret == GNUNET_OK) ? GNUNET_YES : GNUNET_NO);
+  free_request_manager (rm, (ret == GNUNET_OK) ? GNUNET_YES : GNUNET_NO);
   return ret;
 }
 
@@ -972,25 +970,24 @@
                                    GNUNET_ECRS_TestTerminate tt,
                                    void *ttClosure)
 {
-  struct GNUNET_ECRS_DownloadContext * rm;
+  struct GNUNET_ECRS_DownloadContext *rm;
 
   rm = GNUNET_ECRS_file_download_partial_start (ectx,
-                                               cfg,
-                                               uri,
-                                               filename,
-                                               offset,
-                                               length,
-                                               anonymityLevel,
-                                               no_temporaries,
-                                               dpcb,
-                                               dpcbClosure);
+                                                cfg,
+                                                uri,
+                                                filename,
+                                                offset,
+                                                length,
+                                                anonymityLevel,
+                                                no_temporaries,
+                                                dpcb, dpcbClosure);
   if (rm == NULL)
     return (length == 0) ? GNUNET_OK : GNUNET_SYSERR;
   while ((GNUNET_OK == tt (ttClosure)) &&
          (GNUNET_YES != GNUNET_shutdown_test ()) &&
          (rm->abortFlag == GNUNET_NO) && (rm->head != NULL))
     GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);
-  return GNUNET_ECRS_file_download_partial_stop(rm);
+  return GNUNET_ECRS_file_download_partial_stop (rm);
 }
 
 /**

Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c    2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/fs/ecrs/search.c    2008-02-25 07:30:55 UTC (rev 
6454)
@@ -112,7 +112,8 @@
 add_search (unsigned int type,
             unsigned int keyCount,
             const GNUNET_HashCode * keys,
-            const GNUNET_HashCode * dkey, struct GNUNET_ECRS_SearchContext 
*sqc)
+            const GNUNET_HashCode * dkey,
+            struct GNUNET_ECRS_SearchContext *sqc)
 {
   struct PendingSearch *ps;
 
@@ -267,7 +268,8 @@
 static int
 process_nblock_result (const NBlock * nb,
                        const GNUNET_HashCode * key,
-                       unsigned int size, struct GNUNET_ECRS_SearchContext 
*sqc)
+                       unsigned int size,
+                       struct GNUNET_ECRS_SearchContext *sqc)
 {
   struct GNUNET_GE_Context *ectx = sqc->ectx;
   GNUNET_ECRS_FileInfo fi;
@@ -551,11 +553,16 @@
  * @param uri set to the URI of the uploaded file
  */
 struct GNUNET_ECRS_SearchContext *
-GNUNET_ECRS_search_start (struct GNUNET_GE_Context *ectx, struct 
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, unsigned int 
anonymityLevel, GNUNET_ECRS_SearchResultProcessor spcb, void *spcbClosure)
+GNUNET_ECRS_search_start (struct GNUNET_GE_Context *ectx,
+                          struct GNUNET_GC_Configuration *cfg,
+                          const struct GNUNET_ECRS_URI *uri,
+                          unsigned int anonymityLevel,
+                          GNUNET_ECRS_SearchResultProcessor spcb,
+                          void *spcbClosure)
 {
-  struct GNUNET_ECRS_SearchContext * ctx;
+  struct GNUNET_ECRS_SearchContext *ctx;
 
-  ctx = GNUNET_malloc(sizeof(  struct GNUNET_ECRS_SearchContext));  
+  ctx = GNUNET_malloc (sizeof (struct GNUNET_ECRS_SearchContext));
   ctx->start = GNUNET_get_time ();
   ctx->anonymityLevel = anonymityLevel;
   ctx->ectx = ectx;
@@ -577,7 +584,7 @@
  * @param uri set to the URI of the uploaded file
  */
 void
-GNUNET_ECRS_search_stop (struct GNUNET_ECRS_SearchContext * ctx)
+GNUNET_ECRS_search_stop (struct GNUNET_ECRS_SearchContext *ctx)
 {
   struct PendingSearch *pos;
   GNUNET_FS_destroy_search_context (ctx->sctx);
@@ -588,7 +595,7 @@
       GNUNET_free (pos);
     }
   GNUNET_mutex_destroy (ctx->lock);
-  GNUNET_free(ctx);
+  GNUNET_free (ctx);
 }
 
 /**
@@ -607,14 +614,16 @@
                     void *spcbClosure, GNUNET_ECRS_TestTerminate tt,
                     void *ttClosure)
 {
-  struct GNUNET_ECRS_SearchContext * ctx;
+  struct GNUNET_ECRS_SearchContext *ctx;
 
-  ctx = GNUNET_ECRS_search_start(ectx, cfg, uri, anonymityLevel, spcb, 
spcbClosure);
-  while (((NULL == tt) ||
-          (GNUNET_OK == tt (ttClosure))) &&
-         (GNUNET_NO == GNUNET_shutdown_test ()) && (ctx->aborted == GNUNET_NO))
+  ctx =
+    GNUNET_ECRS_search_start (ectx, cfg, uri, anonymityLevel, spcb,
+                              spcbClosure);
+  while (((NULL == tt) || (GNUNET_OK == tt (ttClosure)))
+         && (GNUNET_NO == GNUNET_shutdown_test ())
+         && (ctx->aborted == GNUNET_NO))
     GNUNET_thread_sleep (100 * GNUNET_CRON_MILLISECONDS);
-  GNUNET_ECRS_search_stop(ctx);
+  GNUNET_ECRS_search_stop (ctx);
   return GNUNET_OK;
 }
 

Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c  2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/fs/fsui/download.c  2008-02-25 07:30:55 UTC (rev 
6454)
@@ -140,19 +140,18 @@
 /**
  * Trigger recursive download.
  */
-static void 
-download_recursive (GNUNET_FSUI_DownloadList *dl)
+static void
+download_recursive (GNUNET_FSUI_DownloadList * dl)
 {
   char *dirBlock;
   int fd;
   char *fn;
   size_t totalBytes;
   struct GNUNET_ECRS_MetaData *md;
-  
+
   totalBytes = GNUNET_ECRS_uri_get_file_size (dl->fi.uri);
   fn =
-    GNUNET_malloc (strlen (dl->filename) + strlen (GNUNET_DIRECTORY_EXT) +
-                  1);
+    GNUNET_malloc (strlen (dl->filename) + strlen (GNUNET_DIRECTORY_EXT) + 1);
   strcpy (fn, dl->filename);
   fd = strlen (fn) - 1;
   if (fn[fd] == '/' || fn[fd] == '\\')
@@ -165,39 +164,38 @@
     {
       dirBlock = MMAP (NULL, totalBytes, PROT_READ, MAP_SHARED, fd, 0);
       if (MAP_FAILED == dirBlock)
-       {
-         GNUNET_GE_LOG_STRERROR_FILE (dl->ctx->ectx,
-                                      GNUNET_GE_ERROR | GNUNET_GE_BULK |
-                                      GNUNET_GE_ADMIN | GNUNET_GE_USER,
-                                      "mmap", fn);
-       }
+        {
+          GNUNET_GE_LOG_STRERROR_FILE (dl->ctx->ectx,
+                                       GNUNET_GE_ERROR | GNUNET_GE_BULK |
+                                       GNUNET_GE_ADMIN | GNUNET_GE_USER,
+                                       "mmap", fn);
+        }
       else
-       {
-         md = NULL;
-         GNUNET_ECRS_directory_list_contents (dl->ctx->ectx,
-                                              dirBlock,
-                                              totalBytes,
-                                              &md,
-                                              &listURIfoundDirectory,
-                                              dl);
-         if (md != NULL)
-           GNUNET_ECRS_meta_data_destroy (md);   
-         if (dl->is_recursive)
-           {
-             /* load directory, start downloads */
-             md = NULL;
-             GNUNET_mutex_lock (dl->ctx->lock);
-             GNUNET_ECRS_directory_list_contents (dl->ctx->ectx,
-                                                  dirBlock,
-                                                  totalBytes,
-                                                  &md,
-                                                  &triggerRecursiveDownload,
-                                                  dl);
-             GNUNET_mutex_unlock (dl->ctx->lock);
-             GNUNET_ECRS_meta_data_destroy (md);
-             MUNMAP (dirBlock, totalBytes);
-           }
-       }
+        {
+          md = NULL;
+          GNUNET_ECRS_directory_list_contents (dl->ctx->ectx,
+                                               dirBlock,
+                                               totalBytes,
+                                               &md,
+                                               &listURIfoundDirectory, dl);
+          if (md != NULL)
+            GNUNET_ECRS_meta_data_destroy (md);
+          if (dl->is_recursive)
+            {
+              /* load directory, start downloads */
+              md = NULL;
+              GNUNET_mutex_lock (dl->ctx->lock);
+              GNUNET_ECRS_directory_list_contents (dl->ctx->ectx,
+                                                   dirBlock,
+                                                   totalBytes,
+                                                   &md,
+                                                   &triggerRecursiveDownload,
+                                                   dl);
+              GNUNET_mutex_unlock (dl->ctx->lock);
+              GNUNET_ECRS_meta_data_destroy (md);
+              MUNMAP (dirBlock, totalBytes);
+            }
+        }
       CLOSE (fd);
     }
   GNUNET_free (fn);
@@ -328,11 +326,11 @@
                                  dl->ctx->cfg,
                                  dl->fi.uri,
                                  GNUNET_URITRACK_DOWNLOAD_COMPLETED);
-      dl->ctx->ecb (dl->ctx->ecbClosure, &event); 
-      if ( (dl->is_directory == GNUNET_YES) &&
-          (GNUNET_ECRS_uri_get_file_size (dl->fi.uri) > 0) )
-       download_recursive(dl);
-    }  
+      dl->ctx->ecb (dl->ctx->ecbClosure, &event);
+      if ((dl->is_directory == GNUNET_YES) &&
+          (GNUNET_ECRS_uri_get_file_size (dl->fi.uri) > 0))
+        download_recursive (dl);
+    }
 }
 
 /**
@@ -474,18 +472,21 @@
                      list->filename);
 #endif
       list->state = GNUNET_FSUI_ACTIVE;
-      list->startTime = GNUNET_get_time() - list->runTime;
-      list->handle = GNUNET_ECRS_file_download_partial_start(list->ctx->ectx, 
list->ctx->cfg, list->fi.uri, list->filename,
-                                                            0,
-                                                            
GNUNET_ECRS_uri_get_file_size(list->fi.uri),
-                                                            
list->anonymityLevel, 
-                                                            GNUNET_NO,
-                                                            
&downloadProgressCallback,
-                                                            list);
+      list->startTime = GNUNET_get_time () - list->runTime;
+      list->handle =
+        GNUNET_ECRS_file_download_partial_start (list->ctx->ectx,
+                                                 list->ctx->cfg, list->fi.uri,
+                                                 list->filename, 0,
+                                                 GNUNET_ECRS_uri_get_file_size
+                                                 (list->fi.uri),
+                                                 list->anonymityLevel,
+                                                 GNUNET_NO,
+                                                 &downloadProgressCallback,
+                                                 list);
       if (list->handle != NULL)
-       list->ctx->activeDownloadThreads++;
+        list->ctx->activeDownloadThreads++;
       else
-       list->state = GNUNET_FSUI_ERROR_JOINED;
+        list->state = GNUNET_FSUI_ERROR_JOINED;
     }
 
   /* should this one be stopped? */
@@ -503,7 +504,7 @@
 #endif
       list->state = GNUNET_FSUI_SUSPENDING;
       GNUNET_GE_ASSERT (ectx, list->handle != NULL);
-      GNUNET_ECRS_file_download_partial_stop(list->handle);
+      GNUNET_ECRS_file_download_partial_stop (list->handle);
       list->handle = NULL;
       list->ctx->activeDownloadThreads--;
       list->state = GNUNET_FSUI_PENDING;
@@ -521,7 +522,7 @@
                      "Download thread manager collects inactive download of 
file `%s'\n",
                      list->filename);
 #endif
-      GNUNET_ECRS_file_download_partial_stop(list->handle);
+      GNUNET_ECRS_file_download_partial_stop (list->handle);
       list->handle = NULL;
       list->ctx->activeDownloadThreads--;
       list->state++;            /* adds _JOINED */
@@ -564,7 +565,7 @@
   if (dl->state == GNUNET_FSUI_ACTIVE)
     {
       dl->state = GNUNET_FSUI_ABORTED_JOINED;
-      GNUNET_ECRS_file_download_partial_stop(dl->handle);
+      GNUNET_ECRS_file_download_partial_stop (dl->handle);
       dl->handle = NULL;
       dl->runTime = GNUNET_get_time () - dl->startTime;
       event.type = GNUNET_FSUI_download_aborted;
@@ -627,7 +628,7 @@
       (dl->state == GNUNET_FSUI_ABORTED) || (dl->state == GNUNET_FSUI_ERROR))
     {
       GNUNET_GE_ASSERT (ctx->ectx, dl->handle != NULL);
-      GNUNET_ECRS_file_download_partial_stop(dl->handle);
+      GNUNET_ECRS_file_download_partial_stop (dl->handle);
       dl->handle = NULL;
       dl->runTime = GNUNET_get_time () - dl->startTime;
       GNUNET_mutex_lock (ctx->lock);

Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c      2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/fs/fsui/fsui.c      2008-02-25 07:30:55 UTC (rev 
6454)
@@ -322,19 +322,20 @@
       if (list->state == GNUNET_FSUI_PENDING)
         {
           list->state = GNUNET_FSUI_ACTIVE;
-         list->handle = GNUNET_ECRS_search_start(list->ctx->ectx,
-                                                 list->ctx->cfg,
-                                                 list->uri,
-                                                 list->anonymityLevel,
-                                                 
&GNUNET_FSUI_search_progress_callback,
-                                                 list);
+          list->handle = GNUNET_ECRS_search_start (list->ctx->ectx,
+                                                   list->ctx->cfg,
+                                                   list->uri,
+                                                   list->anonymityLevel,
+                                                   
&GNUNET_FSUI_search_progress_callback,
+                                                   list);
           if (list->handle == NULL)
-           {
-             GNUNET_GE_LOG (ectx,
-                            GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
-                            GNUNET_GE_IMMEDIATE, "Failed to resume search\n");
-             list->state = GNUNET_FSUI_PENDING;
-           }
+            {
+              GNUNET_GE_LOG (ectx,
+                             GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+                             GNUNET_GE_IMMEDIATE,
+                             "Failed to resume search\n");
+              list->state = GNUNET_FSUI_PENDING;
+            }
         }
       list = list->next;
     }
@@ -498,8 +499,8 @@
         {
           if (spos->state == GNUNET_FSUI_ACTIVE)
             spos->state = GNUNET_FSUI_PENDING;
-         GNUNET_ECRS_search_stop(spos->handle);
-         spos->handle = NULL;
+          GNUNET_ECRS_search_stop (spos->handle);
+          spos->handle = NULL;
           if (spos->state != GNUNET_FSUI_PENDING)
             spos->state++;      /* _JOINED */
         }

Modified: GNUnet/src/applications/fs/fsui/fsui.h
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.h      2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/fs/fsui/fsui.h      2008-02-25 07:30:55 UTC (rev 
6454)
@@ -458,7 +458,8 @@
 
 int
 GNUNET_FSUI_search_progress_callback (const GNUNET_ECRS_FileInfo * fi,
-                                     const GNUNET_HashCode * key, int isRoot, 
void *cls);
+                                      const GNUNET_HashCode * key, int isRoot,
+                                      void *cls);
 
 void *GNUNET_FSUI_uploadThread (void *dl);
 

Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c    2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/fs/fsui/search.c    2008-02-25 07:30:55 UTC (rev 
6454)
@@ -69,7 +69,8 @@
  */
 int
 GNUNET_FSUI_search_progress_callback (const GNUNET_ECRS_FileInfo * fi,
-                                     const GNUNET_HashCode * key, int isRoot, 
void *cls)
+                                      const GNUNET_HashCode * key, int isRoot,
+                                      void *cls)
 {
   GNUNET_FSUI_SearchList *pos = cls;
   unsigned int i;
@@ -229,12 +230,12 @@
   event.data.SearchStarted.searchURI = pos->uri;
   event.data.SearchStarted.anonymityLevel = pos->anonymityLevel;
   pos->cctx = pos->ctx->ecb (pos->ctx->ecbClosure, &event);
-  pos->handle = GNUNET_ECRS_search_start(pos->ctx->ectx,
-                                        pos->ctx->cfg,
-                                        pos->uri,
-                                        pos->anonymityLevel,
-                                        &GNUNET_FSUI_search_progress_callback,
-                                        pos);
+  pos->handle = GNUNET_ECRS_search_start (pos->ctx->ectx,
+                                          pos->ctx->cfg,
+                                          pos->uri,
+                                          pos->anonymityLevel,
+                                          
&GNUNET_FSUI_search_progress_callback,
+                                          pos);
   if (pos->handle == NULL)
     {
       GNUNET_ECRS_uri_destroy (pos->uri);
@@ -269,7 +270,7 @@
       GNUNET_mutex_unlock (ctx->lock);
       return GNUNET_SYSERR;
     }
-  GNUNET_ECRS_search_stop(sl->handle);
+  GNUNET_ECRS_search_stop (sl->handle);
   sl->state = GNUNET_FSUI_ABORTED_JOINED;
   sl->handle = NULL;
   event.type = GNUNET_FSUI_search_aborted;
@@ -295,7 +296,7 @@
       GNUNET_mutex_unlock (ctx->lock);
       return GNUNET_SYSERR;
     }
-  GNUNET_ECRS_search_stop(sl->handle);
+  GNUNET_ECRS_search_stop (sl->handle);
   sl->state = GNUNET_FSUI_PAUSED;
   event.type = GNUNET_FSUI_search_paused;
   event.data.SearchPaused.sc.pos = sl;
@@ -320,12 +321,12 @@
   event.data.SearchStarted.sc.pos = pos;
   event.data.SearchStarted.sc.cctx = pos->cctx;
   pos->ctx->ecb (pos->ctx->ecbClosure, &event);
-  pos->handle = GNUNET_ECRS_search_start(pos->ctx->ectx,
-                                        pos->ctx->cfg,
-                                        pos->uri,
-                                        pos->anonymityLevel,
-                                        &GNUNET_FSUI_search_progress_callback,
-                                        pos);
+  pos->handle = GNUNET_ECRS_search_start (pos->ctx->ectx,
+                                          pos->ctx->cfg,
+                                          pos->uri,
+                                          pos->anonymityLevel,
+                                          
&GNUNET_FSUI_search_progress_callback,
+                                          pos);
   if (pos->handle == NULL)
     {
       pos->state = GNUNET_FSUI_PAUSED;

Modified: GNUnet/src/applications/fs/gap/shared.h
===================================================================
--- GNUnet/src/applications/fs/gap/shared.h     2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/fs/gap/shared.h     2008-02-25 07:30:55 UTC (rev 
6454)
@@ -182,9 +182,9 @@
   /**
    * What is the chance that we have more results
    * locally for this request?  Set to a positive
-   * number if we think we have more results, 
+   * number if we think we have more results,
    * decremented by one each time we fail to find
-   * more results; set to zero if we are sure 
+   * more results; set to zero if we are sure
    * that we have no more results.
    */
   unsigned int have_more;

Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c      2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/fs/lib/fslib.c      2008-02-25 07:30:55 UTC (rev 
6454)
@@ -359,7 +359,7 @@
            (keyCount - 1) * sizeof (GNUNET_HashCode));
   req->header.type = htons (GNUNET_CS_PROTO_GAP_QUERY_START);
   req->anonymityLevel = htonl (anonymityLevel);
-  req->type = htonl (type);                    
+  req->type = htonl (type);
   if (target != NULL)
     req->target = *target;
   else

Modified: GNUnet/src/applications/fs/tools/gnunet-auto-share.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-auto-share.c        2008-02-25 
07:18:01 UTC (rev 6453)
+++ GNUnet/src/applications/fs/tools/gnunet-auto-share.c        2008-02-25 
07:30:55 UTC (rev 6454)
@@ -435,7 +435,8 @@
   return errorCode;
 }
 
-void auto_share_shutdown_initiate ()
+void
+auto_share_shutdown_initiate ()
 {
   // FIXME
 }
@@ -509,7 +510,8 @@
   theServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP;
   theServiceStatus.dwCurrentState = SERVICE_RUNNING;
 
-  hService = GNRegisterServiceCtrlHandler ("GNUnet Auto Share", 
ServiceCtrlHandler);
+  hService =
+    GNRegisterServiceCtrlHandler ("GNUnet Auto Share", ServiceCtrlHandler);
   if (!hService)
     return;
 

Modified: GNUnet/src/applications/hostlist/hostlist.c
===================================================================
--- GNUnet/src/applications/hostlist/hostlist.c 2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/hostlist/hostlist.c 2008-02-25 07:30:55 UTC (rev 
6454)
@@ -123,9 +123,9 @@
                                         MHD_GET_ARGUMENT_KIND, "p");
   if ((protos == NULL) || (1 != sscanf (protos, "%llu", &results.protocols)))
     results.protocols = -1;
-  for 
(i=GNUNET_TRANSPORT_PROTOCOL_NUMBER_MAX;i>GNUNET_TRANSPORT_PROTOCOL_NUMBER_NAT;i--)
-    host_processor (coreAPI->myIdentity,
-                   i, GNUNET_YES, &results);
+  for (i = GNUNET_TRANSPORT_PROTOCOL_NUMBER_MAX;
+       i > GNUNET_TRANSPORT_PROTOCOL_NUMBER_NAT; i--)
+    host_processor (coreAPI->myIdentity, i, GNUNET_YES, &results);
   identity->forEachHost (GNUNET_get_time (), &host_processor, &results);
   if (results.size == 0)
     return MHD_NO;              /* no known hosts!? */

Modified: GNUnet/src/applications/hostlist/hostlisttest.c
===================================================================
--- GNUnet/src/applications/hostlist/hostlisttest.c     2008-02-25 07:18:01 UTC 
(rev 6453)
+++ GNUnet/src/applications/hostlist/hostlisttest.c     2008-02-25 07:30:55 UTC 
(rev 6454)
@@ -46,7 +46,7 @@
 }
 
 /**
- * Testcase to test hostlist. 
+ * Testcase to test hostlist.
  */
 int
 main (int argc, char **argv)

Modified: GNUnet/src/applications/rpc/parameters.c
===================================================================
--- GNUnet/src/applications/rpc/parameters.c    2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/applications/rpc/parameters.c    2008-02-25 07:30:55 UTC (rev 
6454)
@@ -30,7 +30,7 @@
 #include "platform.h"
 
 /**
- * A linked list of parameters to/from an RPC call. 
+ * A linked list of parameters to/from an RPC call.
  */
 struct Parameter
 {

Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c   2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/applications/rpc/rpc.c   2008-02-25 07:30:55 UTC (rev 6454)
@@ -62,7 +62,7 @@
  * @brief Request to execute an function call on the remote peer.  The
  * message is of variable size to pass arguments.  Requests and reply
  * messages use the same struct, the only difference is in the value
- * of the header.type field.  
+ * of the header.type field.
  */
 typedef struct
 {
@@ -199,7 +199,7 @@
   P2P_rpc_MESSAGE *msg;
 
   /**
-   * Function to call once we get a reply. 
+   * Function to call once we get a reply.
    */
   GNUNET_RPC_AsynchronousCompletionCallback callback;
 
@@ -264,7 +264,7 @@
   char *name;
 
   /**
-   * Callback for an asynchronous RPC. 
+   * Callback for an asynchronous RPC.
    */
   GNUNET_RPC_AsynchronousFunction async_callback;
 
@@ -420,7 +420,7 @@
 }
 
 /**
- * Get the arguments (or return value) from 
+ * Get the arguments (or return value) from
  * the request.
  */
 static struct GNUNET_RPC_CallParameters *

Modified: GNUnet/src/applications/sqstore_mysql/mysqltest2.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest2.c  2008-02-25 07:18:01 UTC 
(rev 6453)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest2.c  2008-02-25 07:30:55 UTC 
(rev 6454)
@@ -148,8 +148,8 @@
                    GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 1000));
   memset (&value[1], i, size - sizeof (GNUNET_DatastoreValue));
   if (i > 255)
-    memset (&value[1], i-255, (size - sizeof (GNUNET_DatastoreValue))/2);
-  ((char*)&value[1])[0] = k;
+    memset (&value[1], i - 255, (size - sizeof (GNUNET_DatastoreValue)) / 2);
+  ((char *) &value[1])[0] = k;
   if (GNUNET_OK != api->put (&key, value))
     {
       GNUNET_free (value);

Modified: GNUnet/src/applications/sqstore_mysql/mysqltest3.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest3.c  2008-02-25 07:18:01 UTC 
(rev 6453)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest3.c  2008-02-25 07:30:55 UTC 
(rev 6454)
@@ -82,8 +82,8 @@
                    GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 1000));
   memset (&value[1], i, size - sizeof (GNUNET_DatastoreValue));
   if (i > 255)
-    memset (&value[1], i-255, (size - sizeof (GNUNET_DatastoreValue))/2);
-  ((char*)&value[1])[0] = k;
+    memset (&value[1], i - 255, (size - sizeof (GNUNET_DatastoreValue)) / 2);
+  ((char *) &value[1])[0] = k;
   if (GNUNET_OK != api->put (&key, value))
     {
       GNUNET_free (value);

Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c        2008-02-25 
07:18:01 UTC (rev 6453)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c        2008-02-25 
07:30:55 UTC (rev 6454)
@@ -148,8 +148,8 @@
                    GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 1000));
   memset (&value[1], i, size - sizeof (GNUNET_DatastoreValue));
   if (i > 255)
-    memset (&value[1], i-255, (size - sizeof (GNUNET_DatastoreValue))/2);
-  ((char*)&value[1])[0] = k;
+    memset (&value[1], i - 255, (size - sizeof (GNUNET_DatastoreValue)) / 2);
+  ((char *) &value[1])[0] = k;
   if (GNUNET_OK != api->put (&key, value))
     {
       GNUNET_free (value);

Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c        2008-02-25 
07:18:01 UTC (rev 6453)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c        2008-02-25 
07:30:55 UTC (rev 6454)
@@ -82,8 +82,8 @@
                    GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 1000));
   memset (&value[1], i, size - sizeof (GNUNET_DatastoreValue));
   if (i > 255)
-    memset (&value[1], i-255, (size - sizeof (GNUNET_DatastoreValue))/2);
-  ((char*)&value[1])[0] = k;
+    memset (&value[1], i - 255, (size - sizeof (GNUNET_DatastoreValue)) / 2);
+  ((char *) &value[1])[0] = k;
   if (GNUNET_OK != api->put (&key, value))
     {
       GNUNET_free (value);

Modified: GNUnet/src/applications/vpn/cs.c
===================================================================
--- GNUnet/src/applications/vpn/cs.c    2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/applications/vpn/cs.c    2008-02-25 07:30:55 UTC (rev 6454)
@@ -34,7 +34,7 @@
 #include "helper.h"
 
 /**
- * send given string to client 
+ * send given string to client
  */
 static void
 cprintf (struct GNUNET_ClientHandle *c, unsigned short t, const char *format,

Modified: GNUnet/src/applications/vpn/p2p.c
===================================================================
--- GNUnet/src/applications/vpn/p2p.c   2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/applications/vpn/p2p.c   2008-02-25 07:30:55 UTC (rev 6454)
@@ -25,7 +25,7 @@
  *
  * TODO:
  * - do not use HANG UP as a shutdown notification; we have a better API now!
- * - define and use structs for messages 
+ * - define and use structs for messages
  */
 #include "vpn.h"
 #include "p2p.h"

Modified: GNUnet/src/include/gnunet_ecrs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_ecrs_lib.h        2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/include/gnunet_ecrs_lib.h        2008-02-25 07:30:55 UTC (rev 
6454)
@@ -697,8 +697,7 @@
  * @param uri specifies the search parameters
  * @param uri set to the URI of the uploaded file
  */
-struct GNUNET_ECRS_SearchContext *
-GNUNET_ECRS_search_start (struct GNUNET_GE_Context *ectx, struct 
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, unsigned int 
anonymityLevel, GNUNET_ECRS_SearchResultProcessor spcb, void *spcbClosure); /* 
search.c */
+struct GNUNET_ECRS_SearchContext *GNUNET_ECRS_search_start (struct 
GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration *cfg, const struct 
GNUNET_ECRS_URI *uri, unsigned int anonymityLevel, 
GNUNET_ECRS_SearchResultProcessor spcb, void *spcbClosure);    /* search.c */
 
 /**
  * Stop search for content.
@@ -706,8 +705,7 @@
  * @param uri specifies the search parameters
  * @param uri set to the URI of the uploaded file
  */
-void
-GNUNET_ECRS_search_stop (struct GNUNET_ECRS_SearchContext * sctx);
+void GNUNET_ECRS_search_stop (struct GNUNET_ECRS_SearchContext *sctx);
 
 /**
  * Search for content (synchronous version).
@@ -724,7 +722,7 @@
  * @param totalBytes number of bytes that will need to be downloaded,
  *        excluding inner blocks; the value given here will
  *        be one larger than the requested download size to signal
- *        an error.  In that case, all other values will be 0, 
+ *        an error.  In that case, all other values will be 0,
  *        except form "lastBlock" which will point to an error
  *        message describing the problem.
  * @param completedBytes number of bytes that have been obtained
@@ -762,23 +760,25 @@
  * @param start starting offset
  * @param length length of the download (starting at offset)
  */
-struct GNUNET_ECRS_DownloadContext *
-GNUNET_ECRS_file_download_partial_start (struct GNUNET_GE_Context *ectx,
-                                        struct GNUNET_GC_Configuration *cfg,
-                                        const struct GNUNET_ECRS_URI *uri,
-                                        const char *filename,
-                                        unsigned long long offset,
-                                        unsigned long long length,
-                                        unsigned int anonymityLevel,
-                                        int no_temporaries,
-                                        GNUNET_ECRS_DownloadProgressCallback 
dpcb,
-                                        void *dpcbClosure);
+struct GNUNET_ECRS_DownloadContext
+  *GNUNET_ECRS_file_download_partial_start (struct GNUNET_GE_Context *ectx,
+                                            struct GNUNET_GC_Configuration
+                                            *cfg,
+                                            const struct GNUNET_ECRS_URI *uri,
+                                            const char *filename,
+                                            unsigned long long offset,
+                                            unsigned long long length,
+                                            unsigned int anonymityLevel,
+                                            int no_temporaries,
+                                            
GNUNET_ECRS_DownloadProgressCallback
+                                            dpcb, void *dpcbClosure);
 
 /**
  * Stop a download (aborts if download is incomplete).
  */
 int
-GNUNET_ECRS_file_download_partial_stop (struct GNUNET_ECRS_DownloadContext * 
rm);
+GNUNET_ECRS_file_download_partial_stop (struct GNUNET_ECRS_DownloadContext
+                                        *rm);
 
 /**
  * DOWNLOAD a file.

Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h        2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/include/gnunet_fsui_lib.h        2008-02-25 07:30:55 UTC (rev 
6454)
@@ -175,7 +175,7 @@
  * PAUSED means that the user asked to pause the activity
  * (and that it is to be resumed once the user explicitly
  * asks for it to be resumed).
- * 
+ *
  * COMPLETED means that the download is finished (but the
  * thread has not been joined yet).  The download thread
  * makes the transition from PENDING to COMPLETED when it

Modified: GNUnet/src/include/gnunet_sqstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_sqstore_service.h 2008-02-25 07:18:01 UTC (rev 
6453)
+++ GNUnet/src/include/gnunet_sqstore_service.h 2008-02-25 07:30:55 UTC (rev 
6454)
@@ -72,7 +72,7 @@
    * in the datastore.
    *
    * @param key maybe NULL (to match all entries)
-   * @param vhash hash of the value, maybe NULL (to 
+   * @param vhash hash of the value, maybe NULL (to
    *        match all values that have the right key).
    *        Note that for DBlocks there is no difference
    *        betwen key and vhash, but for other blocks

Modified: GNUnet/src/transports/common.c
===================================================================
--- GNUnet/src/transports/common.c      2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/transports/common.c      2008-02-25 07:30:55 UTC (rev 6454)
@@ -366,7 +366,8 @@
       return NULL;              /* TCP transport is configured SEND-only! */
     }
   msg = GNUNET_malloc (sizeof (GNUNET_MessageHello) + sizeof (HostAddress));
-  msg->header.size = htons(sizeof (GNUNET_MessageHello) + sizeof 
(HostAddress));
+  msg->header.size =
+    htons (sizeof (GNUNET_MessageHello) + sizeof (HostAddress));
   haddr = (HostAddress *) & msg[1];
 
   available = VERSION_AVAILABLE_NONE;

Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c        2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/transports/http.c        2008-02-25 07:30:55 UTC (rev 6454)
@@ -445,7 +445,7 @@
  * Lock for concurrent access to all structures used
  * by http, including CURL.
  */
-static struct GNUNET_Mutex * lock;
+static struct GNUNET_Mutex *lock;
 
 
 /**
@@ -601,7 +601,7 @@
 #endif
 
   if (stats != NULL)
-    stats->change(stat_mhd_close_callbacks, 1);
+    stats->change (stat_mhd_close_callbacks, 1);
   ENTER ();
   if (httpsession == NULL)
     return;                     /* oops */
@@ -724,7 +724,7 @@
   struct MHDGetData *mgd = cls;
 
   if (stats != NULL)
-    stats->change(stat_mhd_read_callbacks, 1);
+    stats->change (stat_mhd_read_callbacks, 1);
   ENTER ();
   GNUNET_mutex_lock (lock);
   if (mgd->wpos < max)
@@ -803,7 +803,7 @@
   unsigned int poff;
 
   if (stats != NULL)
-    stats->change(stat_mhd_access_callbacks, 1);
+    stats->change (stat_mhd_access_callbacks, 1);
   ENTER ();
 #if DEBUG_HTTP
   GNUNET_GE_LOG (coreAPI->ectx,
@@ -1033,7 +1033,7 @@
   GNUNET_TransportPacket *mp;
 
   if (stats != NULL)
-    stats->change(stat_curl_receive_callbacks, 1);
+    stats->change (stat_curl_receive_callbacks, 1);
   ENTER ();
   httpSession->cs.client.last_get_activity = GNUNET_get_time ();
 #if DEBUG_HTTP
@@ -1108,7 +1108,7 @@
   size_t max = size * nmemb;
 
   if (stats != NULL)
-    stats->change(stat_curl_send_callbacks, 1);
+    stats->change (stat_curl_send_callbacks, 1);
   ENTER ();
   put->last_activity = GNUNET_get_time ();
   if (max > put->size - put->pos)
@@ -1136,8 +1136,8 @@
   char *url;
   GNUNET_EncName enc;
   unsigned short available;
-  const char * obr;
-  const char * cbr;
+  const char *obr;
+  const char *cbr;
   const HostAddress *haddr =
     (const HostAddress *) &httpSession->cs.client.address;
 
@@ -1155,8 +1155,8 @@
               EXIT ();
               return;
             }
-         obr = "";
-         cbr = "";
+          obr = "";
+          cbr = "";
         }
       else if ((available & VERSION_AVAILABLE_IPV6) > 0)
         {
@@ -1166,17 +1166,16 @@
               EXIT ();
               return;
             }
-         obr = "[";
-         cbr = "]";
+          obr = "[";
+          cbr = "]";
         }
       else
-       return; /* error */
+        return;                 /* error */
       url = GNUNET_malloc (64 + sizeof (GNUNET_EncName) + strlen (buf));
       GNUNET_snprintf (url,
                        64 + sizeof (GNUNET_EncName),
-                       "http://%s%s%s:%u/%s";, obr, buf, cbr, 
-                      ntohs(haddr->port),
-                      &enc);
+                       "http://%s%s%s:%u/%s";, obr, buf, cbr,
+                       ntohs (haddr->port), &enc);
       httpSession->cs.client.url = url;
     }
   EXIT ();
@@ -1295,7 +1294,7 @@
   int i;
 
   if (stats != NULL)
-    stats->change(stat_connect_calls, 1);
+    stats->change (stat_connect_calls, 1);
   ENTER ();
   /* check if we have a session pending for this peer */
   tsession = NULL;
@@ -1543,7 +1542,7 @@
 #endif
 
   if (stats != NULL)
-    stats->change(stat_send_calls, 1);
+    stats->change (stat_send_calls, 1);
   ENTER ();
   if (httpSession->is_client)
     {
@@ -1561,7 +1560,7 @@
           if (httpSession->cs.client.puts != NULL)
             {
               /* do not queue more than one unimportant PUT at a time */
-             signal_select ();       /* do clean up now! */
+              signal_select (); /* do clean up now! */
               GNUNET_mutex_unlock (lock);
               if (stats != NULL)
                 stats->change (stat_bytesDropped, size);
@@ -1620,7 +1619,7 @@
       /* need to grow or discard */
       if (!important)
         {
-         GNUNET_mutex_unlock (lock);
+          GNUNET_mutex_unlock (lock);
           EXIT ();
           return GNUNET_NO;
         }
@@ -1890,7 +1889,7 @@
       tv.tv_usec = (timeout % 1000) * 1000;
       STEP ();
       if (stats != NULL)
-       stats->change(stat_select_calls, 1);
+        stats->change (stat_select_calls, 1);
       SELECT (max + 1, &rs, &ws, &es, (have_tv == MHD_YES) ? &tv : NULL);
       STEP ();
       if (GNUNET_YES != http_running)
@@ -1907,7 +1906,7 @@
       while ((mret == CURLM_CALL_MULTI_PERFORM)
              && (http_running == GNUNET_YES));
       if (FD_ISSET (signal_pipe[0], &rs))
-       read (signal_pipe[0], buf, sizeof(buf));
+        read (signal_pipe[0], buf, sizeof (buf));
       if ((mret != CURLM_OK) && (mret != CURLM_CALL_MULTI_PERFORM))
         GNUNET_GE_LOG (coreAPI->ectx,
                        GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
@@ -2133,8 +2132,7 @@
       stat_select_calls
         = stats->create (gettext_noop ("# HTTP select calls"));
 
-      stat_send_calls
-        = stats->create (gettext_noop ("# HTTP send calls"));
+      stat_send_calls = stats->create (gettext_noop ("# HTTP send calls"));
 
       stat_curl_send_callbacks
         = stats->create (gettext_noop ("# HTTP curl send callbacks"));

Modified: GNUnet/src/transports/ip.c
===================================================================
--- GNUnet/src/transports/ip.c  2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/transports/ip.c  2008-02-25 07:30:55 UTC (rev 6454)
@@ -288,8 +288,8 @@
               if (ifa_ptr->ifa_addr->sa_family != AF_INET6)
                 continue;
               memcpy (identity,
-                      &((struct sockaddr_in6 *) ifa_ptr->ifa_addr)->sin6_addr, 
-                     sizeof (struct in6_addr));              
+                      &((struct sockaddr_in6 *) ifa_ptr->ifa_addr)->sin6_addr,
+                      sizeof (struct in6_addr));
               freeifaddrs (ifa_first);
               GNUNET_free (interfaces);
               return GNUNET_OK;
@@ -327,47 +327,43 @@
       if (strlen (ipString) > 0)
         {
 #if HAVE_GETADDRINFO
-         int s;
-         struct addrinfo hints;         
-         struct addrinfo *result;
+          int s;
+          struct addrinfo hints;
+          struct addrinfo *result;
 
-         memset(&hints, 0, sizeof(struct addrinfo));
-         hints.ai_family = AF_INET6;    /* Allow only IPv6 */
-         hints.ai_socktype = SOCK_STREAM; /* fixme? */
-         hints.ai_protocol = 0;          /* Any protocol */
-         hints.ai_canonname = NULL;
-         hints.ai_addr = NULL;
-         hints.ai_next = NULL;
-         
-         if (0 !=
-             (s = getaddrinfo(ipString,
-                              NULL,
-                              &hints,
-                              &result)))
-           {
-             GNUNET_GE_LOG (ectx,
+          memset (&hints, 0, sizeof (struct addrinfo));
+          hints.ai_family = AF_INET6;   /* Allow only IPv6 */
+          hints.ai_socktype = SOCK_STREAM;      /* fixme? */
+          hints.ai_protocol = 0;        /* Any protocol */
+          hints.ai_canonname = NULL;
+          hints.ai_addr = NULL;
+          hints.ai_next = NULL;
+
+          if (0 != (s = getaddrinfo (ipString, NULL, &hints, &result)))
+            {
+              GNUNET_GE_LOG (ectx,
                              GNUNET_GE_ERROR | GNUNET_GE_USER |
                              GNUNET_GE_BULK,
                              _("Could not resolve `%s': %s\n"), ipString,
-                             gai_strerror(s));
-           }
-         else
-           {
-             if ( (result != NULL) &&
-                  (result->ai_addrlen == sizeof(struct sockaddr_in6)) )
-               {
-                 GNUNET_GE_ASSERT (ectx,
-                                   sizeof (struct in6_addr) ==
-                                   sizeof (GNUNET_IPv6Address));
-                 memcpy(address,
-                        &((struct sockaddr_in6*)result->ai_addr)->sin6_addr,
-                        sizeof(struct in6_addr));
-                 retval = GNUNET_OK;
-               }
-             freeaddrinfo(result);
-           }                 
+                             gai_strerror (s));
+            }
+          else
+            {
+              if ((result != NULL) &&
+                  (result->ai_addrlen == sizeof (struct sockaddr_in6)))
+                {
+                  GNUNET_GE_ASSERT (ectx,
+                                    sizeof (struct in6_addr) ==
+                                    sizeof (GNUNET_IPv6Address));
+                  memcpy (address,
+                          &((struct sockaddr_in6 *) result->ai_addr)->
+                          sin6_addr, sizeof (struct in6_addr));
+                  retval = GNUNET_OK;
+                }
+              freeaddrinfo (result);
+            }
 #else
-         struct hostent *ip;   
+          struct hostent *ip;
 
           ip = gethostbyname2 (ipString, AF_INET6);
           if (ip == NULL)
@@ -382,18 +378,17 @@
             {
               GNUNET_GE_ASSERT (ectx, 0);
             }
-         else
-           {
-             GNUNET_GE_ASSERT (ectx,
-                               sizeof (struct in6_addr) ==
-                               sizeof (address->addr));
-             GNUNET_GE_ASSERT (ectx,
-                               sizeof (struct in6_addr) ==
-                               sizeof (GNUNET_IPv6Address));
-             memcpy (address, ip->h_addr_list[0],
-                     sizeof (struct in6_addr));
-             retval = GNUNET_OK;           
-           }
+          else
+            {
+              GNUNET_GE_ASSERT (ectx,
+                                sizeof (struct in6_addr) ==
+                                sizeof (address->addr));
+              GNUNET_GE_ASSERT (ectx,
+                                sizeof (struct in6_addr) ==
+                                sizeof (GNUNET_IPv6Address));
+              memcpy (address, ip->h_addr_list[0], sizeof (struct in6_addr));
+              retval = GNUNET_OK;
+            }
 #endif
         }
       GNUNET_free (ipString);

Modified: GNUnet/src/transports/test.c
===================================================================
--- GNUnet/src/transports/test.c        2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/transports/test.c        2008-02-25 07:30:55 UTC (rev 6454)
@@ -116,8 +116,8 @@
         {
           hello = transport->createhello ();
           /* HACK hello -- change port! */
-          ((HostAddress *) &hello[1])->port =
-            htons (ntohs (((HostAddress *) &hello[1])->port) - OFFSET);
+          ((HostAddress *) & hello[1])->port =
+            htons (ntohs (((HostAddress *) & hello[1])->port) - OFFSET);
           if (GNUNET_OK != transport->connect (hello, &tsession, GNUNET_NO))
             {
               GNUNET_free (hello);
@@ -176,7 +176,7 @@
   GNUNET_MessageHello *hello;
 
   memset (&api, 0, sizeof (GNUNET_CoreAPIForTransport));
-  pid = fork();
+  pid = fork ();
   res = GNUNET_init (argc,
                      argv,
                      "transport-test",
@@ -267,8 +267,8 @@
       /* client - initiate requests */
       hello = transport->createhello ();
       /* HACK hello -- change port! */
-      ((HostAddress *) &hello[1])->port =
-       htons (ntohs (((HostAddress *) &hello[1])->port) + OFFSET);
+      ((HostAddress *) & hello[1])->port =
+        htons (ntohs (((HostAddress *) & hello[1])->port) + OFFSET);
       if (GNUNET_OK != transport->connect (hello, &tsession, GNUNET_NO))
         {
           GNUNET_free (hello);

Modified: GNUnet/src/transports/test_repeat.c
===================================================================
--- GNUnet/src/transports/test_repeat.c 2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/transports/test_repeat.c 2008-02-25 07:30:55 UTC (rev 6454)
@@ -118,8 +118,8 @@
         {
           hello = transport->createhello ();
           /* HACK hello -- change port! */
-          ((HostAddress *) &hello[1])->port =
-            htons (ntohs (((HostAddress *) &hello[1])->port) - OFFSET);
+          ((HostAddress *) & hello[1])->port =
+            htons (ntohs (((HostAddress *) & hello[1])->port) - OFFSET);
           if (GNUNET_OK != transport->connect (hello, &tsession, GNUNET_NO))
             {
               GNUNET_free (hello);
@@ -281,8 +281,8 @@
           /* client - initiate requests */
           hello = transport->createhello ();
           /* HACK hello -- change port! */
-          ((HostAddress *) &hello[1])->port =
-            htons (ntohs (((HostAddress *) &hello[1])->port) + OFFSET);
+          ((HostAddress *) & hello[1])->port =
+            htons (ntohs (((HostAddress *) & hello[1])->port) + OFFSET);
           if (GNUNET_OK != transport->connect (hello, &tsession, GNUNET_NO))
             {
               GNUNET_free (hello);

Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c    2008-02-25 07:18:01 UTC (rev 6453)
+++ GNUnet/src/util/network/select.c    2008-02-25 07:30:55 UTC (rev 6454)
@@ -533,7 +533,8 @@
                 timeout = 0;
               else
                 timeout =
-                  GNUNET_MIN (timeout, session->lastUse + session->timeout - 
now);
+                  GNUNET_MIN (timeout,
+                              session->lastUse + session->timeout - now);
             }
         }
       GNUNET_mutex_unlock (sh->lock);
@@ -903,10 +904,10 @@
       GNUNET_free (sh);
       return NULL;
     }
-  if ( (GNUNET_OK !=
-       GNUNET_pipe_make_nonblocking (sh->ectx, sh->signal_pipe[0])) ||
-       (GNUNET_OK !=
-       GNUNET_pipe_make_nonblocking (sh->ectx, sh->signal_pipe[1])) )
+  if ((GNUNET_OK !=
+       GNUNET_pipe_make_nonblocking (sh->ectx, sh->signal_pipe[0])) ||
+      (GNUNET_OK !=
+       GNUNET_pipe_make_nonblocking (sh->ectx, sh->signal_pipe[1])))
     {
       if ((0 != CLOSE (sh->signal_pipe[0])) ||
           (0 != CLOSE (sh->signal_pipe[1])))





reply via email to

[Prev in Thread] Current Thread [Next in Thread]