[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 85
From: |
gitolite |
Subject: |
[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 85e5e38ea65d92cf22a444c756f03ad22043daf6 |
Date: |
Thu, 13 Oct 2016 12:29:11 +0200 (CEST) |
The branch, master has been updated
via 85e5e38ea65d92cf22a444c756f03ad22043daf6 (commit)
from 06867e0f11193f550038e3c2875130d46666aaac (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 85e5e38ea65d92cf22a444c756f03ad22043daf6
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date: Thu Oct 13 13:14:58 2016 +0300
Always use 'struct' for ITC.
Help to detect accidental incorrect usage.
-----------------------------------------------------------------------
Summary of changes:
src/microhttpd/internal.h | 2 +-
src/microhttpd/mhd_itc.c | 2 +-
src/microhttpd/mhd_itc.h | 18 +++++++++---------
src/microhttpd/mhd_itc_types.h | 22 ++++++++--------------
4 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 0545e90..6e5ea67 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -1354,7 +1354,7 @@ struct MHD_Daemon
/**
* Inter-thread communication channel.
*/
- MHD_itc_ itc;
+ struct MHD_itc_ itc;
/**
* Are we shutting down?
diff --git a/src/microhttpd/mhd_itc.c b/src/microhttpd/mhd_itc.c
index d2ad805..53c496f 100644
--- a/src/microhttpd/mhd_itc.c
+++ b/src/microhttpd/mhd_itc.c
@@ -44,7 +44,7 @@
* @return non-zero if succeeded, zero otherwise
*/
int
-MHD_itc_nonblocking_ (MHD_itc_ itc)
+MHD_itc_nonblocking_ (struct MHD_itc_ itc)
{
unsigned int i;
diff --git a/src/microhttpd/mhd_itc.h b/src/microhttpd/mhd_itc.h
index 68d3e07..df92b53 100644
--- a/src/microhttpd/mhd_itc.h
+++ b/src/microhttpd/mhd_itc.h
@@ -63,7 +63,7 @@
* @param itc the itc to initialise
* @return non-zero if succeeded, zero otherwise
*/
-#define MHD_itc_init_(itc) (-1 != ((itc) = eventfd (0, EFD_CLOEXEC |
EFD_NONBLOCK)))
+#define MHD_itc_init_(itc) (-1 != ((itc).fd = eventfd (0, EFD_CLOEXEC |
EFD_NONBLOCK)))
/**
* Get description string of last errno for itc operations.
@@ -82,21 +82,21 @@ static const uint64_t _MHD_itc_wr_data = 1;
* @return non-zero if succeeded, zero otherwise
*/
#define MHD_itc_activate_(itc, str) \
- ((write((itc), (const void*)&_MHD_itc_wr_data, 8) > 0) || (EAGAIN == errno))
+ ((write((itc).fd, (const void*)&_MHD_itc_wr_data, 8) > 0) || (EAGAIN ==
errno))
/**
* Return read FD of @a itc which can be used for poll(), select() etc.
* @param itc the itc to get FD
* @return FD of read side
*/
-#define MHD_itc_r_fd_(itc) ((int)(itc))
+#define MHD_itc_r_fd_(itc) ((itc).fd)
/**
* Return write FD of @a itc
* @param itc the itc to get FD
* @return FD of write side
*/
-#define MHD_itc_w_fd_(itc) ((int)(itc))
+#define MHD_itc_w_fd_(itc) ((itc).fd)
/**
* Clear signaled state on @a itc
@@ -104,7 +104,7 @@ static const uint64_t _MHD_itc_wr_data = 1;
*/
#define MHD_itc_clear_(itc) \
do { uint64_t __b; int __r; \
- __r = read((itc), &__b, sizeof(__b)); \
+ __r = read((itc).fd, &__b, sizeof(__b)); \
(void)__r; } while(0)
/**
@@ -112,7 +112,7 @@ static const uint64_t _MHD_itc_wr_data = 1;
* @param itc the itc to destroy
* @return non-zero if succeeded, zero otherwise
*/
-#define MHD_itc_destroy_(itc) ((0 != close (itc)) || (EBADF != errno))
+#define MHD_itc_destroy_(itc) ((0 != close ((itc).fd)) || (EBADF != errno))
/**
* Check whether ITC has valid value.
@@ -123,13 +123,13 @@ static const uint64_t _MHD_itc_wr_data = 1;
* @return boolean true if @a itc has valid value,
* boolean false otherwise.
*/
-#define MHD_ITC_IS_VALID_(itc) (-1 != (itc))
+#define MHD_ITC_IS_VALID_(itc) (-1 != ((itc).fd))
/**
* Set @a itc to invalid value.
* @param itc the itc to set
*/
-#define MHD_itc_set_invalid_(itc) ((itc) = -1)
+#define MHD_itc_set_invalid_(itc) ((itc).fd = -1)
#elif defined(_MHD_ITC_PIPE)
@@ -236,7 +236,7 @@ static const uint64_t _MHD_itc_wr_data = 1;
* @return non-zero if succeeded, zero otherwise
*/
int
- MHD_itc_nonblocking_ (MHD_itc_ itc);
+ MHD_itc_nonblocking_ (struct MHD_itc_ itc);
#endif /* ! HAVE_PIPE2_FUNC */
diff --git a/src/microhttpd/mhd_itc_types.h b/src/microhttpd/mhd_itc_types.h
index f91e938..04966d3 100644
--- a/src/microhttpd/mhd_itc_types.h
+++ b/src/microhttpd/mhd_itc_types.h
@@ -42,23 +42,22 @@
/**
* Data type for a MHD ITC.
*/
-typedef int MHD_itc_;
+struct MHD_itc_
+{
+ int fd;
+};
#elif defined(_MHD_ITC_PIPE)
/* **************** Standard UNIX ITC implementation by pipe ********** */
/**
- * Base data type for a MHD ITC.
+ * Data type for a MHD ITC.
*/
-struct MHD_Itc
+struct MHD_itc_
{
int fd[2];
};
-/**
- * Data type for a MHD ITC.
- */
-typedef struct MHD_Itc MHD_itc_;
#elif defined(_MHD_ITC_SOCKETPAIR)
/* **************** ITC implementation by socket pair ********** */
@@ -66,18 +65,13 @@ typedef struct MHD_Itc MHD_itc_;
#include "mhd_sockets.h"
/**
- * Base data type for a MHD ITC.
+ * Data type for a MHD ITC.
*/
-struct MHD_Itc
+struct MHD_itc_
{
MHD_socket sk[2];
};
-/**
- * Data type for a MHD ITC.
- */
-typedef struct MHD_Itc MHD_itc_;
-
#endif /* _MHD_ITC_SOCKETPAIR */
#endif /* ! MHD_ITC_TYPES_H */
hooks/post-receive
--
GNU libmicrohttpd
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 85e5e38ea65d92cf22a444c756f03ad22043daf6,
gitolite <=