[GNUnet-SVN] r38109 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2016-10-11 17:20:56 +0200 (Tue, 11 Oct 2016)
New Revision: 38109

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
   libmicrohttpd/src/microhttpd/mhd_itc.h
Log:
Renamed 'MHD_pipe_' -> 'MHD_itc_init_'

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-10-11 15:20:53 UTC (rev 
38108)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-10-11 15:20:56 UTC (rev 
38109)
@@ -4462,7 +4462,7 @@
     use_pipe = 0; /* useless if we are using 'external' select */
   if (use_pipe)
   {
-    if (! MHD_pipe_ (daemon->wpipe))
+    if (! MHD_itc_init_ (daemon->wpipe))
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
@@ -4984,7 +4984,7 @@
           /* Always use individual control pipes */
           if (1)
             {
-              if (! MHD_pipe_ (d->wpipe))
+              if (! MHD_itc_init_ (d->wpipe))
                 {
 #ifdef HAVE_MESSAGES
                   MHD_DLOG (daemon,

Modified: libmicrohttpd/src/microhttpd/mhd_itc.h
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_itc.h      2016-10-11 15:20:53 UTC (rev 
38108)
+++ libmicrohttpd/src/microhttpd/mhd_itc.h      2016-10-11 15:20:56 UTC (rev 
38109)
@@ -55,9 +55,11 @@
 typedef int MHD_itc_;
 
 /**
- * create pipe
+ * Initialise ITC by generating eventFD
+ * @param itc the itc to initialise
+ * @return non-zero if succeeded, zero otherwise
  */
-#define MHD_pipe_(itc) ((-1 == (itc = eventfd (0, EFD_CLOEXEC | 
EFD_NONBLOCK))) ? 0 : !0)
+#define MHD_itc_init_(itc) ((-1 == ((itc) = eventfd (0, EFD_CLOEXEC | 
EFD_NONBLOCK))) ? 0 : !0)
 
 /***
  * Get description string of last errno for pipe operations.
@@ -134,9 +136,11 @@
 typedef struct MHD_Itc MHD_itc_;
 
 /**
- * create pipe
+ * Initialise ITC by generating pipe
+ * @param itc the itc to initialise
+ * @return non-zero if succeeded, zero otherwise
  */
-#define MHD_pipe_(pip) (!pipe((pip).fd))
+#define MHD_itc_init_(itc) (!pipe((itc).fd))
 
 /***
  * Get description string of last errno for pipe operations.
@@ -211,9 +215,11 @@
 typedef struct MHD_Itc MHD_itc_;
 
 /**
- * Create two connected sockets to emulate a pipe.
+ * Initialise ITC by generating socketpair
+ * @param itc the itc to initialise
+ * @return non-zero if succeeded, zero otherwise
  */
-#define MHD_pipe_(pip) MHD_socket_pair_((pip.fd))
+#define MHD_itc_init_(itc) MHD_socket_pair_((itc).fd)
 
 /**
  * Get description string of last pipe error