3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-31 01:13:01 +08:00
Code Issues Projects Releases Wiki Activity

Fix MG_SEND_FUNC/MG_RECV_FUNC rename fail

Browse Source 
PUBLISHED_FROM=da28a75111abb5fb49b122133a66ae9bdf63f474
This commit is contained in:
Marko Mikulicic 2015-10-21 17:33:49 +01:00
parent 57b35e6007
commit cbf968735a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mongoose.c
View File

@ -2534,7 +2534,7 @@ static void mg_read_from_socket(struct mg_connection *conn) {
} }
} else } else
#endif #endif
while ((n = (int) MG_EV_RECV_FUNC( while ((n = (int) MG_RECV_FUNC(
conn->sock, buf, recv_avail_size(conn, sizeof(buf)), 0)) > 0) { conn->sock, buf, recv_avail_size(conn, sizeof(buf)), 0)) > 0) {
DBG(("%p %d bytes (PLAIN) <- %d", conn, n, conn->sock)); DBG(("%p %d bytes (PLAIN) <- %d", conn, n, conn->sock));
mbuf_append(&conn->recv_mbuf, buf, n); mbuf_append(&conn->recv_mbuf, buf, n);
@ -2581,7 +2581,7 @@ static void mg_write_to_socket(struct mg_connection *conn) {
} else } else
#endif #endif
{ {
n = (int) MG_EV_SEND_FUNC(conn->sock, io->buf, io->len, 0); n = (int) MG_SEND_FUNC(conn->sock, io->buf, io->len, 0);
} }
DBG(("%p %d bytes -> %d", conn, n, conn->sock)); DBG(("%p %d bytes -> %d", conn, n, conn->sock));
@ -2706,8 +2706,8 @@ static void mg_mgr_handle_connection(struct mg_connection *nc, int fd_flags,
static void mg_mgr_handle_ctl_sock(struct mg_mgr *mgr) { static void mg_mgr_handle_ctl_sock(struct mg_mgr *mgr) {
struct ctl_msg ctl_msg; struct ctl_msg ctl_msg;
int len = int len =
(int) MG_EV_RECV_FUNC(mgr->ctl[1], (char *) &ctl_msg, sizeof(ctl_msg), 0); (int) MG_RECV_FUNC(mgr->ctl[1], (char *) &ctl_msg, sizeof(ctl_msg), 0);
MG_EV_SEND_FUNC(mgr->ctl[1], ctl_msg.message, 1, 0); MG_SEND_FUNC(mgr->ctl[1], ctl_msg.message, 1, 0);
if (len >= (int) sizeof(ctl_msg.callback) && ctl_msg.callback != NULL) { if (len >= (int) sizeof(ctl_msg.callback) && ctl_msg.callback != NULL) {
struct mg_connection *nc; struct mg_connection *nc;
for (nc = mg_next(mgr, NULL); nc != NULL; nc = mg_next(mgr, nc)) { for (nc = mg_next(mgr, NULL); nc != NULL; nc = mg_next(mgr, nc)) {
@ -3187,9 +3187,9 @@ void mg_broadcast(struct mg_mgr *mgr, mg_event_handler_t cb, void *data,
len < sizeof(ctl_msg.message)) { len < sizeof(ctl_msg.message)) {
ctl_msg.callback = cb; ctl_msg.callback = cb;
memcpy(ctl_msg.message, data, len); memcpy(ctl_msg.message, data, len);
MG_EV_SEND_FUNC(mgr->ctl[0], (char *) &ctl_msg, MG_SEND_FUNC(mgr->ctl[0], (char *) &ctl_msg,
offsetof(struct ctl_msg, message) + len, 0); offsetof(struct ctl_msg, message) + len, 0);
MG_EV_RECV_FUNC(mgr->ctl[0], (char *) &len, 1, 0); MG_RECV_FUNC(mgr->ctl[0], (char *) &len, 1, 0);
} }
} }

8
mongoose.h
View File

@ -605,11 +605,11 @@ typedef void *SSL_CTX;
#endif #endif
#ifdef MG_USE_READ_WRITE #ifdef MG_USE_READ_WRITE
#define MG_EV_RECV_FUNC(s, b, l, f) read(s, b, l) #define MG_RECV_FUNC(s, b, l, f) read(s, b, l)
#define MG_EV_SEND_FUNC(s, b, l, f) write(s, b, l) #define MG_SEND_FUNC(s, b, l, f) write(s, b, l)
#else #else
#define MG_EV_RECV_FUNC(s, b, l, f) recv(s, b, l, f) #define MG_RECV_FUNC(s, b, l, f) recv(s, b, l, f)
#define MG_EV_SEND_FUNC(s, b, l, f) send(s, b, l, f) #define MG_SEND_FUNC(s, b, l, f) send(s, b, l, f)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus