diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-10-11 15:21:07 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-10-11 15:21:07 +0000 |
commit | ec820265a0b7f40fda6be51fbd7b8b0264aab4e9 (patch) | |
tree | 9f54c8c77763342fb74acc50d86c2e468ef12cde | |
parent | fbf5dfc5f4631519b9ea88a033e85418d0fe5e45 (diff) | |
download | libmicrohttpd-ec820265a0b7f40fda6be51fbd7b8b0264aab4e9.tar.gz libmicrohttpd-ec820265a0b7f40fda6be51fbd7b8b0264aab4e9.zip |
Renamed 'MHD_pipe_last_strerror_' -> 'MHD_itc_last_strerror_'
-rw-r--r-- | src/microhttpd/daemon.c | 8 | ||||
-rw-r--r-- | src/microhttpd/mhd_itc.h | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 644143bc..26a87782 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -4467,7 +4467,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4467 | #ifdef HAVE_MESSAGES | 4467 | #ifdef HAVE_MESSAGES |
4468 | MHD_DLOG (daemon, | 4468 | MHD_DLOG (daemon, |
4469 | _("Failed to create control pipe: %s\n"), | 4469 | _("Failed to create control pipe: %s\n"), |
4470 | MHD_pipe_last_strerror_ ()); | 4470 | MHD_itc_last_strerror_ ()); |
4471 | #endif | 4471 | #endif |
4472 | free (daemon); | 4472 | free (daemon); |
4473 | return NULL; | 4473 | return NULL; |
@@ -4477,7 +4477,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4477 | #ifdef HAVE_MESSAGES | 4477 | #ifdef HAVE_MESSAGES |
4478 | MHD_DLOG (daemon, | 4478 | MHD_DLOG (daemon, |
4479 | _("Failed to make read side of inter-thread control channel non-blocking: %s\n"), | 4479 | _("Failed to make read side of inter-thread control channel non-blocking: %s\n"), |
4480 | MHD_pipe_last_strerror_ ()); | 4480 | MHD_itc_last_strerror_ ()); |
4481 | #endif | 4481 | #endif |
4482 | MHD_pipe_close_ (daemon->itc); | 4482 | MHD_pipe_close_ (daemon->itc); |
4483 | free (daemon); | 4483 | free (daemon); |
@@ -4989,7 +4989,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4989 | #ifdef HAVE_MESSAGES | 4989 | #ifdef HAVE_MESSAGES |
4990 | MHD_DLOG (daemon, | 4990 | MHD_DLOG (daemon, |
4991 | _("Failed to create worker control pipe: %s\n"), | 4991 | _("Failed to create worker control pipe: %s\n"), |
4992 | MHD_pipe_last_strerror_() ); | 4992 | MHD_itc_last_strerror_() ); |
4993 | #endif | 4993 | #endif |
4994 | goto thread_failed; | 4994 | goto thread_failed; |
4995 | } | 4995 | } |
@@ -4998,7 +4998,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4998 | #ifdef HAVE_MESSAGES | 4998 | #ifdef HAVE_MESSAGES |
4999 | MHD_DLOG (daemon, | 4999 | MHD_DLOG (daemon, |
5000 | _("Failed to make read side of worker inter-thread control channel non-blocking: %s\n"), | 5000 | _("Failed to make read side of worker inter-thread control channel non-blocking: %s\n"), |
5001 | MHD_pipe_last_strerror_ ()); | 5001 | MHD_itc_last_strerror_ ()); |
5002 | #endif | 5002 | #endif |
5003 | goto thread_failed; | 5003 | goto thread_failed; |
5004 | } | 5004 | } |
diff --git a/src/microhttpd/mhd_itc.h b/src/microhttpd/mhd_itc.h index 7b2a5cc7..9f77dcc4 100644 --- a/src/microhttpd/mhd_itc.h +++ b/src/microhttpd/mhd_itc.h | |||
@@ -61,10 +61,10 @@ typedef int MHD_itc_; | |||
61 | */ | 61 | */ |
62 | #define MHD_itc_init_(itc) (-1 != ((itc) = eventfd (0, EFD_CLOEXEC | EFD_NONBLOCK))) | 62 | #define MHD_itc_init_(itc) (-1 != ((itc) = eventfd (0, EFD_CLOEXEC | EFD_NONBLOCK))) |
63 | 63 | ||
64 | /*** | 64 | /** |
65 | * Get description string of last errno for pipe operations. | 65 | * Get description string of last errno for itc operations. |
66 | */ | 66 | */ |
67 | #define MHD_pipe_last_strerror_() strerror(errno) | 67 | #define MHD_itc_last_strerror_() strerror(errno) |
68 | 68 | ||
69 | /** | 69 | /** |
70 | * write data to real pipe | 70 | * write data to real pipe |
@@ -142,10 +142,10 @@ typedef struct MHD_Itc MHD_itc_; | |||
142 | */ | 142 | */ |
143 | #define MHD_itc_init_(itc) (!pipe((itc).fd)) | 143 | #define MHD_itc_init_(itc) (!pipe((itc).fd)) |
144 | 144 | ||
145 | /*** | 145 | /** |
146 | * Get description string of last errno for pipe operations. | 146 | * Get description string of last errno for itc operations. |
147 | */ | 147 | */ |
148 | #define MHD_pipe_last_strerror_() strerror(errno) | 148 | #define MHD_itc_last_strerror_() strerror(errno) |
149 | 149 | ||
150 | /** | 150 | /** |
151 | * write data to real pipe | 151 | * write data to real pipe |
@@ -222,9 +222,9 @@ typedef struct MHD_Itc MHD_itc_; | |||
222 | #define MHD_itc_init_(itc) MHD_socket_pair_((itc).sk) | 222 | #define MHD_itc_init_(itc) MHD_socket_pair_((itc).sk) |
223 | 223 | ||
224 | /** | 224 | /** |
225 | * Get description string of last pipe error | 225 | * Get description string of last error for itc operations. |
226 | */ | 226 | */ |
227 | #define MHD_pipe_last_strerror_() MHD_socket_last_strerr_() | 227 | #define MHD_itc_last_strerror_() MHD_socket_last_strerr_() |
228 | 228 | ||
229 | /** | 229 | /** |
230 | * Write data to emulated pipe | 230 | * Write data to emulated pipe |