[GNUnet-SVN] r30371 - gnunet/src/namestore

[gnunet]

Author: grothoff
Date: 2013-10-20 20:04:56 +0200 (Sun, 20 Oct 2013)
New Revision: 30371

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/test_namestore_api_monitoring.c
Log:
-32 bit, not 16

Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2013-10-20 18:02:39 UTC 
(rev 30370)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2013-10-20 18:04:56 UTC 
(rev 30371)
@@ -1237,7 +1237,7 @@
   GNUNET_SERVER_disable_receive_done_warning (client);
   GNUNET_SERVER_notification_context_add (monitor_nc,
                                          client);
-  if (GNUNET_YES == ntohs (zis_msg->iterate_first))
+  if (GNUNET_YES == ntohl (zis_msg->iterate_first))
     zm->task = GNUNET_SCHEDULER_add_now (&monitor_next, zm);
   else
     monitor_sync (zm);

Modified: gnunet/src/namestore/test_namestore_api_monitoring.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_monitoring.c        2013-10-20 
18:02:39 UTC (rev 30370)
+++ gnunet/src/namestore/test_namestore_api_monitoring.c        2013-10-20 
18:04:56 UTC (rev 30371)
@@ -150,13 +150,15 @@
           unsigned int rd_count,
           const struct GNUNET_GNSRECORD_Data *rd)
 {
-       static int returned_records;
-       static int fail = GNUNET_NO;
+  static int returned_records;
+  static int fail = GNUNET_NO;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Comparing results name %s\n",
              name);
-
-  if (0 != memcmp (zone_key, privkey, sizeof (struct 
GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 != memcmp (zone_key,
+                   privkey,
+                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Monitoring returned wrong zone key\n");
@@ -185,8 +187,9 @@
   else
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-             "Invalid name %s\n",  name);
-       GNUNET_break (0);
+             "Invalid name %s\n",
+                name);
+    GNUNET_break (0);
     fail = GNUNET_YES;
   }
 
@@ -202,7 +205,6 @@
     else
        GNUNET_SCHEDULER_add_now (&end, NULL);
   }
-
 }
 
 
@@ -222,11 +224,15 @@
   if (success == GNUNET_OK)
   {
     c++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record %u: `%s'\n", c, 
label);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Created record %u: `%s'\n",
+                c,
+                label);
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to created records\n");
     GNUNET_break (0);
     GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
@@ -281,7 +287,8 @@
                                            NULL);
   if (NULL == zm)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone monitor\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to create zone monitor\n");
     GNUNET_break (0);
     endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
     return;