-remove unnecessary arguments from ARM callbacks

6 files changed, 51 insertions, 41 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index f221dac7b..3514a8f28 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -230,7 +230,7 @@ reconnect_arm_later (struct GNUNET_ARM_Handle *h)
   */
   h->retry_backoff = GNUNET_TIME_STD_BACKOFF (h->retry_backoff);
   if (NULL != h->conn_status)
-    h->conn_status (h->conn_status_cls, h, GNUNET_NO);
+    h->conn_status (h->conn_status_cls, GNUNET_NO);
 }
 
 /**
@@ -311,7 +311,7 @@ transmit_arm_message (void *cls, size_t size, void *buf)
 
  end:
   if ((GNUNET_YES == notify_connection) && (NULL != h->conn_status))
-    h->conn_status (h->conn_status_cls, h, GNUNET_YES);
+    h->conn_status (h->conn_status_cls, GNUNET_YES);
   return msize;
 }
 
@@ -373,7 +373,7 @@ reconnect_arm (struct GNUNET_ARM_Handle *h)
     LOG (GNUNET_ERROR_TYPE_DEBUG,
            "arm_api, GNUNET_CLIENT_connect returned NULL\n");
     if (NULL != h->conn_status)
-      h->conn_status (h->conn_status_cls, h, GNUNET_SYSERR);
+      h->conn_status (h->conn_status_cls, GNUNET_SYSERR);
     return GNUNET_SYSERR;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -443,7 +443,7 @@ GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *h)
     GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != cm->timeout_task_id);
     GNUNET_SCHEDULER_cancel (cm->timeout_task_id);
     if (NULL != cm->result_cont)
-      cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_DISCONNECTED,
+      cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_DISCONNECTED,
                        NULL, 0);
     /* FIXME: What about list callback? */
     GNUNET_free_non_null (cm->msg);
@@ -492,9 +492,9 @@ control_message_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
                                  cm->h->control_sent_tail, cm);
   }
   if (NULL != cm->result_cont)
-    cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_TIMEOUT, NULL, 0);
+    cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_TIMEOUT, NULL, 0);
   else if (NULL != cm->list_cont)
-    cm->list_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_TIMEOUT, 0, NULL);
+    cm->list_cont (cm->cont_cls, GNUNET_ARM_REQUEST_TIMEOUT, 0, NULL);
   GNUNET_free_non_null (cm->msg);
   GNUNET_free (cm);
 }
@@ -535,7 +535,9 @@ arm_service_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
          "gnunet-service-arm");
     /* arm is running! */
     if (cm->result_cont)
-      cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_SENT_OK, "arm", GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
+      cm->result_cont (cm->cont_cls, 
+                       GNUNET_ARM_REQUEST_SENT_OK, "arm", 
+                       GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
   }
   if (GNUNET_NO == test_is_active)
   {
@@ -566,7 +568,9 @@ arm_service_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, "arm", "BINARY");
     if (cm->result_cont)
-      cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_SENT_OK, "arm", GNUNET_ARM_RESULT_IS_NOT_KNOWN);
+      cm->result_cont (cm->cont_cls, 
+                       GNUNET_ARM_REQUEST_SENT_OK, "arm", 
+                       GNUNET_ARM_RESULT_IS_NOT_KNOWN);
     GNUNET_free (cm);
     GNUNET_free (loprefix);
     GNUNET_free (lopostfix);
@@ -615,13 +619,13 @@ arm_service_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (NULL == proc)
   {
     if (cm->result_cont)
-      cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_SENT_OK, "arm",
+      cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK, "arm",
           GNUNET_ARM_RESULT_START_FAILED);
     GNUNET_free (cm);
     return;
   }
   if (cm->result_cont)
-    cm->result_cont (cm->cont_cls, cm->h, GNUNET_ARM_REQUEST_SENT_OK, "arm",
+    cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK, "arm",
         GNUNET_ARM_RESULT_STARTING);
   GNUNET_OS_process_destroy (proc);
   h = cm->h;
@@ -655,7 +659,7 @@ change_service (struct GNUNET_ARM_Handle *h, const char *service_name,
   {
     GNUNET_break (0);
     if (cb != NULL)
-      cb (cb_cls, h, GNUNET_ARM_REQUEST_TOO_LONG, NULL, 0);
+      cb (cb_cls, GNUNET_ARM_REQUEST_TOO_LONG, NULL, 0);
     return;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Requesting %s of service `%s'.\n",
@@ -718,7 +722,7 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
     {
       LOG (GNUNET_ERROR_TYPE_DEBUG, "ARM is already running\n");
       if (NULL != cont)
-        cont (cont_cls, h, GNUNET_ARM_REQUEST_SENT_OK, "arm", GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
+        cont (cont_cls, GNUNET_ARM_REQUEST_SENT_OK, "arm", GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
     }
     else if (GNUNET_NO == h->service_test_is_active)
     {
@@ -760,7 +764,7 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
        */
       LOG (GNUNET_ERROR_TYPE_DEBUG, "Service test is already in progress, we're busy\n");
       if (NULL != cont)
-        cont (cont_cls, h, GNUNET_ARM_REQUEST_BUSY, NULL, 0);
+        cont (cont_cls, GNUNET_ARM_REQUEST_BUSY, NULL, 0);
     }
     return;
   }
@@ -966,12 +970,12 @@ client_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
          (const char *) &cm->msg[1], ntohs (msg->type));
     result = (enum GNUNET_ARM_Result) ntohl (res->result);
     if (NULL != cm->result_cont)
-      cm->result_cont (cm->cont_cls, h, GNUNET_ARM_REQUEST_SENT_OK,
+      cm->result_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK,
                        (const char *) &cm->msg[1], result);
     break;
   case GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT:
     if (NULL != cm->list_cont)
-        cm->list_cont (cm->cont_cls, h, GNUNET_ARM_REQUEST_SENT_OK, rcount,
+        cm->list_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK, rcount,
                        list);
     GNUNET_free (list);
     break;
diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c
index 7fa53e732..0b8a0699c 100644
--- a/src/arm/arm_monitor_api.c
+++ b/src/arm/arm_monitor_api.c
@@ -221,7 +221,7 @@ reconnect_arm_monitor (struct GNUNET_ARM_MonitorHandle *h)
     LOG (GNUNET_ERROR_TYPE_DEBUG,
            "arm_api, GNUNET_CLIENT_connect returned NULL\n");
     if (NULL != h->service_status)
-      h->service_status (h->cls, h, NULL, GNUNET_ARM_SERVICE_STOPPED);
+      h->service_status (h->cls, NULL, GNUNET_ARM_SERVICE_STOPPED);
     return GNUNET_SYSERR;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -347,7 +347,7 @@ monitor_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     GNUNET_CLIENT_receive (h->monitor, &monitor_notify_handler, h,
                            GNUNET_TIME_UNIT_FOREVER_REL);
     if (NULL != h->service_status)
-      h->service_status (h->cls, h, (const char *) &res[1], status);
+      h->service_status (h->cls, (const char *) &res[1], status);
     break;
   default:
     reconnect_arm_monitor_later (h);
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index cfadbc87a..87d352dfb 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -258,12 +258,11 @@ static void action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
  * Function called whenever we connect to or disconnect from ARM.
  *
  * @param cls closure
- * @param arm handle to the ARM connection
  * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected,
  *                  GNUNET_SYSERR on error.
  */
 static void
-conn_status (void *cls, struct GNUNET_ARM_Handle *arm, 
+conn_status (void *cls, 
              int connected)
 {
   if (GNUNET_SYSERR == connected)
@@ -281,7 +280,7 @@ conn_status (void *cls, struct GNUNET_ARM_Handle *arm,
 
 
 static void
-term_callback (void *cls, struct GNUNET_ARM_Handle *arm,
+term_callback (void *cls, 
     enum GNUNET_ARM_RequestStatus rs, const char *service,
     enum GNUNET_ARM_Result result)
 {
@@ -311,7 +310,7 @@ term_callback (void *cls, struct GNUNET_ARM_Handle *arm,
 }
 
 static void
-end_callback (void *cls, struct GNUNET_ARM_Handle *arm,
+end_callback (void *cls, 
     enum GNUNET_ARM_RequestStatus rs, const char *service,
     enum GNUNET_ARM_Result result)
 {
@@ -348,7 +347,7 @@ end_callback (void *cls, struct GNUNET_ARM_Handle *arm,
 }
 
 static void
-start_callback (void *cls, struct GNUNET_ARM_Handle *arm,
+start_callback (void *cls,
     enum GNUNET_ARM_RequestStatus rs, const char *service,
     enum GNUNET_ARM_Result result)
 {
@@ -378,7 +377,7 @@ start_callback (void *cls, struct GNUNET_ARM_Handle *arm,
 
 
 static void
-init_callback (void *cls, struct GNUNET_ARM_Handle *arm,
+init_callback (void *cls, 
     enum GNUNET_ARM_RequestStatus rs, const char *service,
     enum GNUNET_ARM_Result result)
 {
@@ -409,9 +408,9 @@ init_callback (void *cls, struct GNUNET_ARM_Handle *arm,
 
 
 static void
-list_callback (void *cls, struct GNUNET_ARM_Handle *arm,
-    enum GNUNET_ARM_RequestStatus rs, unsigned int count,
-    const char *const*list)
+list_callback (void *cls, 
+               enum GNUNET_ARM_RequestStatus rs, unsigned int count,
+               const char *const*list)
 {
   unsigned int i;
   if (GNUNET_ARM_REQUEST_SENT_OK != rs)
@@ -517,13 +516,12 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * Function called when a service starts or stops.
  *
  * @param cls closure
- * @param arm handle to the ARM connection
  * @param service service name
  * @param status status of the service
  */
 static void
-srv_status (void *cls, struct GNUNET_ARM_MonitorHandle *arm,
-    const char *service, enum GNUNET_ARM_ServiceStatus status)
+srv_status (void *cls, 
+            const char *service, enum GNUNET_ARM_ServiceStatus status)
 {
   const char *msg;
   switch (status)
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 0b4baa3f8..eb769e2ac 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -47,7 +47,10 @@ static int ok = 1;
 static int phase = 0;
 
 static void
-arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+arm_stop_cb (void *cls, 
+             enum GNUNET_ARM_RequestStatus status, 
+             const char *servicename, 
+             enum GNUNET_ARM_Result result)
 {
   /* (6), a stop request should be sent to ARM successfully */
   /* ARM should report that it is stopping */
@@ -58,8 +61,11 @@ arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStat
   LOG ("Sent 'STOP' request for arm to ARM %s\n", (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
 }
 
+
 static void
-resolver_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+resolver_stop_cb (void *cls, 
+                  enum GNUNET_ARM_RequestStatus status, 
+                  const char *servicename, enum GNUNET_ARM_Result result)
 {
   /* (5), a stop request should be sent to ARM successfully.
    * ARM should report that resolver is stopped.
@@ -77,6 +83,7 @@ resolver_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_Reques
 #endif
 }
 
+
 static void
 dns_notify (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 {
@@ -99,8 +106,12 @@ dns_notify (void *cls, const struct sockaddr *addr, socklen_t addrlen)
   ok = 0;
 }
 
+
 static void
-resolver_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+resolver_start_cb (void *cls, 
+                   enum GNUNET_ARM_RequestStatus status, 
+                   const char *servicename, 
+                   enum GNUNET_ARM_Result result)
 {
   /* (2), the start request for resolver should be sent successfully
    * ARM should report that resolver service is starting.
@@ -113,6 +124,7 @@ resolver_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_Reque
   GNUNET_RESOLVER_ip_get ("localhost", AF_INET, TIMEOUT, &dns_notify, NULL);
 }
 
+
 static void
 trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -122,7 +134,6 @@ trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 arm_conn (void *cls, 
-          struct GNUNET_ARM_Handle *arm, 
           int connected)
 {
   if (GNUNET_SYSERR == connected)
@@ -157,7 +168,6 @@ arm_conn (void *cls,
 
 static void
 arm_start_cb (void *cls, 
-              struct GNUNET_ARM_Handle *h, 
               enum GNUNET_ARM_RequestStatus status, 
               const char *servicename, 
               enum GNUNET_ARM_Result result)
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index 00402b29f..21d2c4f3e 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -284,7 +284,7 @@ trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+arm_stop_cb (void *cls, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
 {
   GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
   GNUNET_break (result == GNUNET_ARM_RESULT_STOPPING);
@@ -294,7 +294,7 @@ arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStat
 
 
 static void
-srv_status (void *cls, struct GNUNET_ARM_MonitorHandle *mon, const char *service, enum GNUNET_ARM_ServiceStatus status)
+srv_status (void *cls, const char *service, enum GNUNET_ARM_ServiceStatus status)
 {
   LOG ("Service %s is %u, phase %u\n", service, status, phase);
   if (status == GNUNET_ARM_SERVICE_MONITORING_STARTED)
@@ -334,7 +334,7 @@ srv_status (void *cls, struct GNUNET_ARM_MonitorHandle *mon, const char *service
 
 
 static void
-arm_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+arm_start_cb (void *cls, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
 {
   GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
   GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
@@ -366,7 +366,7 @@ task (void *cls, char *const *args, const char *cfgfile,
   arm = GNUNET_ARM_connect (cfg, NULL, NULL);
   if (NULL != arm)
   {
-    mon = GNUNET_ARM_monitor (cfg, srv_status, NULL);
+    mon = GNUNET_ARM_monitor (cfg, &srv_status, NULL);
     if (NULL != mon)
     {
 #if START_ARM
diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c
index 816bf4cfb..3bf7156a1 100644
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -56,7 +56,6 @@ trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 arm_stop_cb (void *cls, 
-             struct GNUNET_ARM_Handle *h, 
              enum GNUNET_ARM_RequestStatus status, 
              const char *servicename, 
              enum GNUNET_ARM_Result result)
@@ -70,7 +69,7 @@ arm_stop_cb (void *cls,
 
 
 static void
-service_list (void *cls, struct GNUNET_ARM_Handle *arm,
+service_list (void *cls, 
               enum GNUNET_ARM_RequestStatus rs,
               unsigned int count, const char *const*list)
 {
@@ -109,7 +108,6 @@ hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 
 static void
 arm_start_cb (void *cls, 
-              struct GNUNET_ARM_Handle *h, 
               enum GNUNET_ARM_RequestStatus status, 
               const char *servicename, 
               enum GNUNET_ARM_Result result)