style improvments wrt Mantis 1614 patch

3 files changed, 8 insertions, 11 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 81f1c2d5c..e404f8d27 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -375,7 +375,7 @@ arm_service_report (void *cls,
                     const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct RequestContext *pos = cls;
-  GNUNET_OS_Process *proc;
+  struct GNUNET_OS_Process *proc;
   char *binary;
   char *config;
   char *loprefix;
diff --git a/src/arm/do_start_process.c b/src/arm/do_start_process.c
index 7d691ce60..139d0c429 100644
--- a/src/arm/do_start_process.c
+++ b/src/arm/do_start_process.c
@@ -12,7 +12,7 @@
  * @param ... more arguments, NULL terminated
  * @return PID of the started process, -1 on error
  */
-static GNUNET_OS_Process *
+static struct GNUNET_OS_Process *
 do_start_process (const int *lsocks,
                   const char *first_arg, ...)
 {
@@ -24,7 +24,7 @@ do_start_process (const int *lsocks,
   char *pos;
   char *cp;
   const char *last;
-  GNUNET_OS_Process *proc;
+  struct GNUNET_OS_Process *proc;
 
   argv_size = 1;
   va_start (ap, first_arg);
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 543e65557..ab4db97c7 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -93,7 +93,7 @@ struct ServiceList
   /**
    * Process structure pointer of the child.
    */
-  GNUNET_OS_Process *proc;
+  struct GNUNET_OS_Process *proc;
 
   /**
    * Last time the config of this service was
@@ -434,12 +434,10 @@ start_process (struct ServiceList *sl,
                 sl->name);
   else
     GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-                _("Starting service `%s' (PID: %d)\n"), 
-                sl->name,
-                (int) GNUNET_OS_process_get_pid (sl->proc));
+                _("Starting service `%s'\n"), 
+                sl->name);
   GNUNET_free (loprefix);
   GNUNET_free (options);
-  /* FIXME: should check sl->proc */
 }
 
 
@@ -735,9 +733,8 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       if (pos->proc != NULL)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                      "Stopping service `%s' (PID: %d)\n",
-                      pos->name,
-                      GNUNET_OS_process_get_pid (pos->proc));
+                      "Stopping service `%s'\n",
+                      pos->name);
           if (0 != GNUNET_OS_process_kill (pos->proc, SIGTERM))
             GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
         }