[GNUnet-SVN] r6273 - GNUnet/src/applications/hostlist

[gnunet]

Author: grothoff
Date: 2008-02-13 00:00:01 -0700 (Wed, 13 Feb 2008)
New Revision: 6273

Modified:
   GNUnet/src/applications/hostlist/hostlist.c
Log:
typos

Modified: GNUnet/src/applications/hostlist/hostlist.c
===================================================================
--- GNUnet/src/applications/hostlist/hostlist.c 2008-02-13 06:54:57 UTC (rev 
6272)
+++ GNUnet/src/applications/hostlist/hostlist.c 2008-02-13 07:00:01 UTC (rev 
6273)
@@ -31,7 +31,7 @@
 
 #define DEBUG_HOSTLIST GNUNET_NO
 
-static struct MHD_Daemon * daemon;
+static struct MHD_Daemon * daemon_handle;
 
 static GNUNET_CoreAPIForPlugins *coreAPI;
 
@@ -64,7 +64,7 @@
 };
 
 static int
-host_processor (const GNUNET_PeerIdentity * identity,
+host_processor (const GNUNET_PeerIdentity * peer,
                unsigned short protocol,
                int confirmed, void *data)
 {
@@ -75,15 +75,15 @@
   if ( (GNUNET_YES != confirmed) ||
        ((results->protocols & (1LL << protocol)) == 0) )
     return GNUNET_OK;
-  hello = identity->identity2Hello(identity,
+  hello = identity->identity2Hello(peer,
                                   protocol,
                                   GNUNET_NO);
   if (hello == NULL)
     return GNUNET_OK;
   old = results->size;
-  GNUNET_grow(results->data,
-             results->size,
-             results->size + ntohs(hello->header.size));
+  GNUNET_array_grow(results->data,
+                   results->size,
+                   results->size + ntohs(hello->header.size));
   memcpy(&results->data[old],
         hello,
         ntohs(hello->header.size));
@@ -114,7 +114,7 @@
     }
   if (*upload_data_size != 0)
     return MHD_NO; /* do not support upload data */
-  memset(results, 0, sizeof(struct HostSet));
+  memset(&results, 0, sizeof(struct HostSet));
   results.protocols = -1; /* for now */
   identity->forEachHost(GNUNET_get_time(), &host_processor, &results);
   if (results.size == 0)
@@ -149,7 +149,7 @@
   identity = capi->request_service ("identity");
   if (identity == NULL)
     {
-      GNUNET_GE_BREAK (ectx, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       return GNUNET_SYSERR;
     }
   coreAPI = capi;
@@ -157,20 +157,20 @@
   if (stats != NULL)
     {
       stat_request_count
-        stats->create (gettext_noop ("# hostlist requests received"));
+        = stats->create (gettext_noop ("# hostlist requests received"));
     }
-  daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_IPv6,
-                           (unsigned short) port,
-                           &accept_policy_callback,
-                           NULL,
-                           &access_handler_callback,
-                           NULL,
-                           MHD_OPTION_CONNECTION_LIMIT, 16,
-                           MHD_OPTION_CONNECTION_PER_IP_CONNECTION_LIMIT, 1,
-                           MHD_OPTION_CONNECTION_TIMEOUT, 16,
-                           MHD_OPTION_CONNECTION_MEMORY_LIMIT, 16 * 1024,
-                           MHD_OPTION_END);
-  if (daemon == NULL)
+  daemon_handle = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_IPv6,
+                                  (unsigned short) port,
+                                  &accept_policy_callback,
+                                  NULL,
+                                  &access_handler_callback,
+                                  NULL,
+                                  MHD_OPTION_CONNECTION_LIMIT, 16,
+                                  MHD_OPTION_PER_IP_CONNECTION_LIMIT, 1,
+                                  MHD_OPTION_CONNECTION_TIMEOUT, 16,
+                                  MHD_OPTION_CONNECTION_MEMORY_LIMIT, 16 * 
1024,
+                                  MHD_OPTION_END);
+  if (daemon_handle == NULL)
     {
       if (stats != NULL)
        {
@@ -194,8 +194,8 @@
 void
 done_module_hostlist ()
 {
-  MHD_stop_daemon(daemon);
-  daemon = NULL;
+  MHD_stop_daemon(daemon_handle);
+  daemon_handle = NULL;
   if (stats != NULL)
     {
       coreAPI->release_service (stats);