const-ing of config-handles

4 files changed, 12 insertions, 10 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 7f120e6a6..7ae3e9513 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -39,7 +39,7 @@ struct ArmContext
   void *cls;
   char *service_name;
   struct GNUNET_CLIENT_Connection *client;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_TIME_Absolute timeout;
   uint16_t type;
 };
@@ -195,7 +195,7 @@ send_service_msg (void *cls, size_t size, void *buf)
  */
 static void
 change_service (const char *service_name,
-                struct GNUNET_CONFIGURATION_Handle *cfg,
+                const struct GNUNET_CONFIGURATION_Handle *cfg,
                 struct GNUNET_SCHEDULER_Handle *sched,
                 struct GNUNET_TIME_Relative timeout,
                 GNUNET_ARM_Callback cb, void *cb_cls, uint16_t type)
@@ -266,7 +266,7 @@ change_service (const char *service_name,
  */
 void
 GNUNET_ARM_start_service (const char *service_name,
-                          struct GNUNET_CONFIGURATION_Handle *cfg,
+                          const struct GNUNET_CONFIGURATION_Handle *cfg,
                           struct GNUNET_SCHEDULER_Handle *sched,
                           struct GNUNET_TIME_Relative timeout,
                           GNUNET_ARM_Callback cb, void *cb_cls)
@@ -308,7 +308,7 @@ GNUNET_ARM_start_service (const char *service_name,
  */
 void
 GNUNET_ARM_stop_service (const char *service_name,
-                         struct GNUNET_CONFIGURATION_Handle *cfg,
+                         const struct GNUNET_CONFIGURATION_Handle *cfg,
                          struct GNUNET_SCHEDULER_Handle *sched,
                          struct GNUNET_TIME_Relative timeout,
                          GNUNET_ARM_Callback cb, void *cb_cls)
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index f8f5bc20f..740fd2533 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -111,7 +111,8 @@ static void
 run (void *cls,
      struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
-     const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg)
+     const char *cfgfile, 
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   if (term != NULL)
     {
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index a84445271..32674117c 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -124,7 +124,7 @@ static struct ServiceList *running;
 /**
  * Our configuration
  */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
  * Our scheduler.
@@ -562,7 +562,7 @@ maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                 GNUNET_YES,
                                 GNUNET_SCHEDULER_PRIORITY_IDLE,
                                 GNUNET_SCHEDULER_NO_TASK,
-                                MAINT_FREQUENCY, &maint, cfg);
+                                MAINT_FREQUENCY, &maint, NULL);
 
   /* check for services that died (WAITPID) */
   prev = NULL;
@@ -675,7 +675,7 @@ static void
 run (void *cls,
      struct GNUNET_SCHEDULER_Handle *s,
      struct GNUNET_SERVER_Handle *server,
-     struct GNUNET_CONFIGURATION_Handle *c)
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   char *defaultservices;
   char *pos;
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 89f63d3ec..fbd90583e 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -38,7 +38,7 @@
 
 static struct GNUNET_SCHEDULER_Handle *sched;
 
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static int ok = 1;
 
@@ -84,7 +84,8 @@ static void
 task (void *cls,
       struct GNUNET_SCHEDULER_Handle *s,
       char *const *args,
-      const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *c)
+      const char *cfgfile,
+      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   cfg = c;
   sched = s;