[GNUnet-SVN] r22726 - in gnunet/src: include testbed util

[gnunet]

Author: harsha
Date: 2012-07-17 21:09:02 +0200 (Tue, 17 Jul 2012)
New Revision: 22726

Modified:
   gnunet/src/include/gnunet_helper_lib.h
   gnunet/src/testbed/test_testbed_api_hosts.c
   gnunet/src/testbed/testbed_api.c
   gnunet/src/testbed/testbed_api_hosts.c
   gnunet/src/util/helper.c
Log:
helper exception callback lesser parameters

Modified: gnunet/src/include/gnunet_helper_lib.h
===================================================================
--- gnunet/src/include/gnunet_helper_lib.h      2012-07-17 17:30:04 UTC (rev 
22725)
+++ gnunet/src/include/gnunet_helper_lib.h      2012-07-17 19:09:02 UTC (rev 
22726)
@@ -42,12 +42,8 @@
  * when the helper process is stoped using GNUNET_HELPER_stop()
  *
  * @param cls the closure from GNUNET_HELPER_start()
- * @param h the handle representing the helper process. This handle is invalid
- *          in this callback. It is only presented for reference. No operations
- *          can be performed using it.
  */
-typedef void (*GNUNET_HELPER_ExceptionCallback) (void *cls,
-                                                const struct 
GNUNET_HELPER_Handle *h);
+typedef void (*GNUNET_HELPER_ExceptionCallback) (void *cls);
 
 
 /**

Modified: gnunet/src/testbed/test_testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_hosts.c 2012-07-17 17:30:04 UTC (rev 
22725)
+++ gnunet/src/testbed/test_testbed_api_hosts.c 2012-07-17 19:09:02 UTC (rev 
22726)
@@ -72,12 +72,9 @@
  * when the helper process is stoped using GNUNET_HELPER_stop()
  *
  * @param cls the closure from GNUNET_HELPER_start()
- * @param h the handle representing the helper process. This handle is invalid
- *          in this callback. It is only presented for reference. No operations
- *          can be performed using it.
  */
 static void 
-exp_cb (void *cls, const struct GNUNET_HELPER_Handle *h)
+exp_cb (void *cls)
 {
   status = GNUNET_SYSERR;
   GNUNET_SCHEDULER_cancel (shutdown_id);

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-07-17 17:30:04 UTC (rev 22725)
+++ gnunet/src/testbed/testbed_api.c    2012-07-17 19:09:02 UTC (rev 22726)
@@ -447,12 +447,9 @@
  * when the helper process is stoped using GNUNET_HELPER_stop()
  *
  * @param cls the closure from GNUNET_HELPER_start()
- * @param h the handle representing the helper process. This handle is invalid
- *          in this callback. It is only presented for reference. No operations
- *          can be performed using it.
  */
 static void 
-controller_exp_cb (void *cls, const struct GNUNET_HELPER_Handle *h)
+controller_exp_cb (void *cls)
 {
   struct GNUNET_TESTBED_ControllerProc *cproc = cls;
 

Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c      2012-07-17 17:30:04 UTC (rev 
22725)
+++ gnunet/src/testbed/testbed_api_hosts.c      2012-07-17 19:09:02 UTC (rev 
22726)
@@ -357,18 +357,15 @@
  * when the helper process is stoped using GNUNET_HELPER_stop()
  *
  * @param cls the closure from GNUNET_HELPER_start()
- * @param h the handle representing the helper process. This handle is invalid
- *          in this callback. It is only presented for reference. No operations
- *          can be performed using it.
  */
 static void 
-helper_exp_cb (void *cls, const struct GNUNET_HELPER_Handle *h)
+helper_exp_cb (void *cls)
 {
   struct GNUNET_TESTBED_HelperHandle *handle = cls;
 
   handle->is_stopped = GNUNET_YES;
   GNUNET_TESTBED_host_stop_ (handle);
-  handle->exp_cb (handle->exp_cb_cls, h);
+  handle->exp_cb (handle->exp_cb_cls);
 }
 
 

Modified: gnunet/src/util/helper.c
===================================================================
--- gnunet/src/util/helper.c    2012-07-17 17:30:04 UTC (rev 22725)
+++ gnunet/src/util/helper.c    2012-07-17 19:09:02 UTC (rev 22726)
@@ -256,7 +256,7 @@
                STRERROR (errno));
     if (NULL != h->exp_cb)
     {
-      h->exp_cb (h->cb_cls, h);
+      h->exp_cb (h->cb_cls);
       GNUNET_HELPER_stop (h);
       return;
     }
@@ -275,7 +275,7 @@
                h->binary_name);
     if (NULL != h->exp_cb)
     {
-      h->exp_cb (h->cb_cls, h);
+      h->exp_cb (h->cb_cls);
       GNUNET_HELPER_stop (h);
       return;
     }
@@ -300,7 +300,7 @@
                h->binary_name);
     if (NULL != h->exp_cb)
     {
-      h->exp_cb (h->cb_cls, h);
+      h->exp_cb (h->cb_cls);
       GNUNET_HELPER_stop (h);
       return;
     }