clean up for configs
[oweals/gnunet.git] / src / scalarproduct / gnunet-scalarproduct.c
index 2c966ef158ea6497507af0ee5ed17a6f02ddb721..012ce91b8c2d043d0d92c7dbf7904ac724842925 100644 (file)
@@ -55,22 +55,22 @@ struct ScalarProductCallbackClosure
 /**
  * Option -p: destination peer identity for checking message-ids with
  */
-static char *input_peer_id = NULL;
+static char *input_peer_id;
 
 /**
  * Option -p: destination peer identity for checking message-ids with
  */
-static char *input_key = NULL;
+static char *input_key;
 
 /**
  * Option -e: vector to calculate a scalarproduct with
  */
-static char *input_elements = NULL;
+static char *input_elements;
 
 /**
  * Option -m: message-ids to calculate a scalarproduct with
  */
-static char *input_mask = NULL;
+static char *input_mask;
 
 /**
  * Global return value
@@ -94,18 +94,30 @@ responder_callback (void *cls,
   {
   case GNUNET_SCALARPRODUCT_Status_Success:
     ret = 0;
-    LOG (GNUNET_ERROR_TYPE_INFO, "Session %s concluded.\n", GNUNET_h2s (&closure->key));
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "Session %s concluded.\n",
+         GNUNET_h2s (&closure->key));
     break;
   case GNUNET_SCALARPRODUCT_Status_InvalidResponse:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s failed: invalid response\n", GNUNET_h2s (&closure->key));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Session %s failed: invalid response\n",
+         GNUNET_h2s (&closure->key));
     break;
   case GNUNET_SCALARPRODUCT_Status_Failure:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s failed: service failure\n", GNUNET_h2s (&closure->key));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Session %s failed: service failure\n",
+         GNUNET_h2s (&closure->key));
+    break;
   case GNUNET_SCALARPRODUCT_Status_ServiceDisconnected:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s failed: service disconnect!!\n", GNUNET_h2s (&closure->key));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Session %s failed: service disconnect!\n",
+         GNUNET_h2s (&closure->key));
     break;
   default:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s failed: return code %d\n", GNUNET_h2s (&closure->key), status);
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Session %s failed: return code %d\n",
+         GNUNET_h2s (&closure->key),
+         status);
   }
   GNUNET_SCHEDULER_shutdown();
 }
@@ -136,22 +148,39 @@ requester_callback (void *cls,
       printf ("%s", buf);
     }
     else
-      LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_aprint", rc);
+      LOG_GCRY (GNUNET_ERROR_TYPE_ERROR,
+                "gcry_mpi_aprint",
+                rc);
     break;
   case GNUNET_SCALARPRODUCT_Status_InvalidResponse:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s with peer %s failed: invalid response received\n", GNUNET_h2s (&closure->key), GNUNET_i2s (&closure->peer));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Session %s with peer %s failed: invalid response received\n",
+         GNUNET_h2s (&closure->key),
+         GNUNET_i2s (&closure->peer));
     break;
   case GNUNET_SCALARPRODUCT_Status_Failure:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s with peer %s failed: API failure\n", GNUNET_h2s (&closure->key), GNUNET_i2s (&closure->peer));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Session %s with peer %s failed: API failure\n",
+         GNUNET_h2s (&closure->key),
+         GNUNET_i2s (&closure->peer));
+    break;
   case GNUNET_SCALARPRODUCT_Status_ServiceDisconnected:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s with peer %s was disconnected from service.\n", GNUNET_h2s (&closure->key), GNUNET_i2s (&closure->peer));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Session %s with peer %s was disconnected from service.\n",
+         GNUNET_h2s (&closure->key),
+         GNUNET_i2s (&closure->peer));
     break;
   default:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s with peer %s failed: return code %d\n", GNUNET_h2s (&closure->key), GNUNET_i2s (&closure->peer), status);
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Session %s with peer %s failed: return code %d\n",
+         GNUNET_h2s (&closure->key),
+         GNUNET_i2s (&closure->peer),
+         status);
   }
   GNUNET_SCHEDULER_shutdown();
 }
 
+
 /**
  * Task run during shutdown.
  *
@@ -165,6 +194,7 @@ shutdown_task (void *cls,
   GNUNET_SCALARPRODUCT_disconnect ();
 }
 
+
 /**
  * Main function that will be run by the scheduler.
  *
@@ -179,41 +209,47 @@ run (void *cls,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  char * begin = input_elements;
-  char * end;
+  char *begin = input_elements;
+  char *end;
   int32_t element;
   int i;
-  int32_t * elements;
-  unsigned char * mask;
+  int32_t *elements;
+  unsigned char *mask;
   uint32_t mask_bytes;
   uint32_t element_count = 0;
   struct ScalarProductCallbackClosure * closure;
 
   if (NULL == input_elements)
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR, _ ("You must specify at least one message ID to check!\n"));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _ ("You must specify at least one message ID to check!\n"));
     return;
   }
 
   if (NULL == input_key)
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR, _ ("This program needs a session identifier for comparing vectors.\n"));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _ ("This program needs a session identifier for comparing vectors.\n"));
     return;
   }
 
   if (1 > strnlen (input_key, sizeof (struct GNUNET_HashCode)))
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR, _ ("Please give a session key for --input_key!\n"));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _ ("Please give a session key for --input_key!\n"));
     return;
   }
   closure = GNUNET_new (struct ScalarProductCallbackClosure);
   GNUNET_CRYPTO_hash (input_key, strlen (input_key), &closure->key);
 
-  if (input_peer_id && GNUNET_OK != GNUNET_CRYPTO_hash_from_string (input_peer_id,
-                                                                    (struct GNUNET_HashCode *) &closure->peer))
+  if (input_peer_id &&
+      (GNUNET_OK !=
+       GNUNET_CRYPTO_hash_from_string (input_peer_id,
+                                       (struct GNUNET_HashCode *) &closure->peer)))
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR, _ ("Tried to set initiator mode, as peer ID was given. "
-                                     "However, `%s' is not a valid peer identifier.\n"),
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _ ("Tried to set initiator mode, as peer ID was given. "
+            "However, `%s' is not a valid peer identifier.\n"),
          input_peer_id);
     return;
   }
@@ -236,14 +272,16 @@ run (void *cls,
     }
     else
     {
-      LOG (GNUNET_ERROR_TYPE_ERROR, _ ("Could not convert `%s' to int32_t.\n"), begin);
+      LOG (GNUNET_ERROR_TYPE_ERROR,
+           _ ("Could not convert `%s' to int32_t.\n"), begin);
       return;
     }
   }
   while (1);
   if (0 == element_count)
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR, _ ("Need elements to compute the vectorproduct, got none.\n"));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _ ("Need elements to compute the vectorproduct, got none.\n"));
     return;
   }
 
@@ -269,7 +307,7 @@ run (void *cls,
   }
   while (1);
 
-  mask_bytes = element_count / 8 + (element_count % 8 ? 1 : 0);
+  mask_bytes = element_count / 8 + ( (element_count % 8) ? 1 : 0);
   mask = GNUNET_malloc ((element_count / 8) + 1);
 
   /* Read input_mask_peer1 and read in mask_peer1 array */
@@ -294,7 +332,8 @@ run (void *cls,
       }
       else
       {
-        LOG (GNUNET_ERROR_TYPE_ERROR, _ ("Could not convert `%s' to int32_t.\n"), begin);
+        LOG (GNUNET_ERROR_TYPE_ERROR,
+             _ ("Could not convert `%s' to integer.\n"), begin);
         return;
       }
 
@@ -308,22 +347,33 @@ run (void *cls,
     for (i = 0; i <= mask_bytes; i++)
       mask[i] = UCHAR_MAX; // all 1's
 
-  if (input_peer_id && (NULL == GNUNET_SCALARPRODUCT_request (cfg,
-                                                              &closure->key,
-                                                              &closure->peer,
-                                                              elements, element_count,
-                                                              mask, mask_bytes,
-                                                              &requester_callback,
-                                                              (void *) &closure)))
+  if (input_peer_id &&
+      (NULL == GNUNET_SCALARPRODUCT_request (cfg,
+                                             &closure->key,
+                                             &closure->peer,
+                                             elements, element_count,
+                                             mask, mask_bytes,
+                                             &requester_callback,
+                                             (void *) &closure)))
+  {
+    GNUNET_free (elements);
+    GNUNET_free (mask);
     return;
+  }
 
-  if ((NULL == input_peer_id) && (NULL == GNUNET_SCALARPRODUCT_response (cfg,
-                                                                         &closure->key,
-                                                                         elements, element_count,
-                                                                         &responder_callback,
-                                                                         (void *) &closure)))
+  if ((NULL == input_peer_id) &&
+      (NULL == GNUNET_SCALARPRODUCT_response (cfg,
+                                              &closure->key,
+                                              elements, element_count,
+                                              &responder_callback,
+                                              (void *) &closure)))
+  {
+    GNUNET_free (elements);
+    GNUNET_free (mask);
     return;
-
+  }
+  GNUNET_free (elements);
+  GNUNET_free (mask);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &shutdown_task,
                                 NULL);