merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188

2 files changed, 24 insertions, 14 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index dea7a70be..899b6f152 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -972,10 +972,7 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
      the above check should catch 99.99% of the cases where ARM
      is already running. */LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Starting ARM service\n");
-  if (NULL == (sig = GNUNET_DISK_pipe (GNUNET_NO,
-                                       GNUNET_NO,
-                                       GNUNET_NO,
-                                       GNUNET_YES)))
+  if (NULL == (sig = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE)))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
                          "pipe");
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 00b6e7196..263c99cc4 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -859,7 +859,8 @@ start_process (struct ServiceList *sl,
     if (NULL != options)
       options = GNUNET_CONFIGURATION_expand_dollar (cfg, options);
     sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
-                                          ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL
+                                          ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                          | GNUNET_OS_USE_PIPE_CONTROL
                                           : GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                           lsocks,
                                           loprefix,
@@ -882,8 +883,11 @@ start_process (struct ServiceList *sl,
     {
       if (NULL == sl->config)
         sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
-                                              ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL
-                                              : GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                              ?
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                              | GNUNET_OS_USE_PIPE_CONTROL
+                                              :
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                               lsocks,
                                               loprefix,
                                               quotedbinary,
@@ -893,8 +897,11 @@ start_process (struct ServiceList *sl,
                                               NULL);
       else
         sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
-                                              ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL
-                                              : GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                              ?
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                              | GNUNET_OS_USE_PIPE_CONTROL
+                                              :
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                               lsocks,
                                               loprefix,
                                               quotedbinary,
@@ -909,8 +916,11 @@ start_process (struct ServiceList *sl,
     {
       if (NULL == sl->config)
         sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
-                                              ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL
-                                              : GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                              ?
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                              | GNUNET_OS_USE_PIPE_CONTROL
+                                              :
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                               lsocks,
                                               loprefix,
                                               quotedbinary,
@@ -918,8 +928,11 @@ start_process (struct ServiceList *sl,
                                               NULL);
       else
         sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
-                                              ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL
-                                              : GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                              ?
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                              | GNUNET_OS_USE_PIPE_CONTROL
+                                              :
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                               lsocks,
                                               loprefix,
                                               quotedbinary,
@@ -2157,7 +2170,7 @@ main (int argc, char *const *argv)
     GNUNET_MQ_handler_end ()
   };
 
-  sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO);
+  sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (NULL != sigpipe);
   shc_chld =
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,