From 3701d58f5f283cbb5e618a0c988886df55963ded Mon Sep 17 00:00:00 2001 From: Nils Durner Date: Fri, 15 Jun 2007 22:23:21 +0000 Subject: plibc'ing --- src/daemon/daemon.c | 42 +++++++++++++++++++++--------------------- src/daemon/internal.c | 2 +- src/daemon/session.c | 34 +++++++++++++++++----------------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index 9aad7593..70d5075f 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c @@ -174,7 +174,7 @@ MHD_handle_connection(void * data) { &ws, &es, &max); - num_ready = select(max + 1, + num_ready = SELECT(max + 1, &rs, &ws, &es, @@ -192,7 +192,7 @@ MHD_handle_connection(void * data) { break; } if (con->socket_fd != -1) { - close(con->socket_fd); + CLOSE(con->socket_fd); con->socket_fd = -1; } return NULL; @@ -215,20 +215,20 @@ MHD_accept_connection(struct MHD_Daemon * daemon) { memset(&addr, 0, sizeof(struct sockaddr)); - s = accept(daemon->socket_fd, + s = ACCEPT(daemon->socket_fd, &addr, &addrlen); if ( (s < 0) || (addrlen <= 0) ) { MHD_DLOG(daemon, "Error accepting connection: %s\n", - strerror(errno)); + STRERROR(errno)); return MHD_NO; } if (MHD_NO == daemon->apc(daemon->apc_cls, &addr, addrlen)) { - close(s); + CLOSE(s); return MHD_YES; } session = malloc(sizeof(struct MHD_Session)); @@ -249,9 +249,9 @@ MHD_accept_connection(struct MHD_Daemon * daemon) { session)) ) { MHD_DLOG(daemon, "Failed to create a thread: %s\n", - strerror(errno)); + STRERROR(errno)); free(session->addr); - close(s); + CLOSE(s); free(session); return MHD_NO; } @@ -367,7 +367,7 @@ MHD_select(struct MHD_Daemon * daemon, max = daemon->socket_fd; FD_SET(daemon->socket_fd, &rs); } - num_ready = select(max + 1, + num_ready = SELECT(max + 1, &rs, &ws, &es, @@ -377,7 +377,7 @@ MHD_select(struct MHD_Daemon * daemon, return MHD_YES; MHD_DLOG(daemon, "Select failed: %s\n", - strerror(errno)); + STRERROR(errno)); return MHD_NO; } ds = daemon->socket_fd; @@ -472,12 +472,12 @@ MHD_start_daemon(unsigned int options, if ( (port == 0) || (dh == NULL) ) return NULL; - socket_fd = socket(AF_INET, SOCK_STREAM, 0); + socket_fd = SOCKET(AF_INET, SOCK_STREAM, 0); if (socket_fd < 0) { if ((options & MHD_USE_DEBUG) != 0) fprintf(stderr, "Call to socket failed: %s\n", - strerror(errno)); + STRERROR(errno)); return NULL; } /* FIXME: setsockopt: SO_REUSEADDR? */ @@ -486,23 +486,23 @@ MHD_start_daemon(unsigned int options, sizeof(struct sockaddr_in)); servaddr.sin_family = AF_INET; servaddr.sin_port = htons(port); - if (bind(socket_fd, + if (BIND(socket_fd, (struct sockaddr *)&servaddr, sizeof(struct sockaddr_in)) < 0) { if ( (options & MHD_USE_DEBUG) != 0) fprintf(stderr, "Failed to bind to port %u: %s\n", port, - strerror(errno)); - close(socket_fd); + STRERROR(errno)); + CLOSE(socket_fd); return NULL; } - if (listen(socket_fd, 20) < 0) { + if (LISTEN(socket_fd, 20) < 0) { if ((options & MHD_USE_DEBUG) != 0) fprintf(stderr, "Failed to listen for connections: %s\n", - strerror(errno)); - close(socket_fd); + STRERROR(errno)); + CLOSE(socket_fd); return NULL; } retVal = malloc(sizeof(struct MHD_Daemon)); @@ -526,9 +526,9 @@ MHD_start_daemon(unsigned int options, retVal)) ) { MHD_DLOG(retVal, "Failed to create listen thread: %s\n", - strerror(errno)); + STRERROR(errno)); free(retVal); - close(socket_fd); + CLOSE(socket_fd); return NULL; } return retVal; @@ -544,7 +544,7 @@ MHD_stop_daemon(struct MHD_Daemon * daemon) { if (daemon == NULL) return; daemon->shutdown = 1; - close(daemon->socket_fd); + CLOSE(daemon->socket_fd); daemon->socket_fd = -1; if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || (0 != (daemon->options & MHD_USE_SELECT_INTERNALLY)) ) { @@ -553,7 +553,7 @@ MHD_stop_daemon(struct MHD_Daemon * daemon) { } while (daemon->connections != NULL) { if (-1 != daemon->connections->socket_fd) { - close(daemon->connections->socket_fd); + CLOSE(daemon->connections->socket_fd); daemon->connections->socket_fd = -1; } MHD_cleanup_sessions(daemon); diff --git a/src/daemon/internal.c b/src/daemon/internal.c index ce06e2c6..753a216d 100644 --- a/src/daemon/internal.c +++ b/src/daemon/internal.c @@ -41,7 +41,7 @@ void MHD_DLOG(const struct MHD_Daemon * daemon, if ( (daemon->options & MHD_USE_DEBUG) == 0) return; va_start(va, format); - vfprintf(stderr, format, va); + VFPRINTF(stderr, format, va); va_end(va); } diff --git a/src/daemon/session.c b/src/daemon/session.c index f2dd3832..fa19f6b8 100644 --- a/src/daemon/session.c +++ b/src/daemon/session.c @@ -184,7 +184,7 @@ MHD_get_next_header_line(struct MHD_Session * session) { MHD_DLOG(session->daemon, "Received excessively long header line (>%u), closing connection.\n", 4 * MHD_MAX_BUF_SIZE); - close(session->socket_fd); + CLOSE(session->socket_fd); session->socket_fd = -1; } } @@ -345,7 +345,7 @@ MHD_parse_session_headers(struct MHD_Session * session) { /* FIXME: here: find cookie header and parse that! */ return; DIE: - close(session->socket_fd); + CLOSE(session->socket_fd); session->socket_fd = -1; } @@ -389,7 +389,7 @@ MHD_call_session_handler(struct MHD_Session * session) { /* serios internal error, close connection */ MHD_DLOG(session->daemon, "Internal application error, closing connection."); - close(session->socket_fd); + CLOSE(session->socket_fd); session->socket_fd = -1; return; } @@ -439,7 +439,7 @@ MHD_session_handle_read(struct MHD_Session * session) { __FUNCTION__); return MHD_NO; } - bytes_read = recv(session->socket_fd, + bytes_read = RECV(session->socket_fd, &session->read_buffer[session->readLoc], session->read_buffer_size - session->readLoc, 0); @@ -448,8 +448,8 @@ MHD_session_handle_read(struct MHD_Session * session) { return MHD_NO; MHD_DLOG(session->daemon, "Failed to receive data: %s\n", - strerror(errno)); - close(session->socket_fd); + STRERROR(errno)); + CLOSE(session->socket_fd); session->socket_fd = -1; return MHD_YES; } @@ -458,7 +458,7 @@ MHD_session_handle_read(struct MHD_Session * session) { /* FIXME: proper handling of end of upload! If we were receiving an unbounded upload, we should finish up nicely now! */ - close(session->socket_fd); + CLOSE(session->socket_fd); session->socket_fd = -1; return MHD_YES; } @@ -488,7 +488,7 @@ MHD_add_extra_headers(struct MHD_Session * session) { "close"); } else if (NULL == MHD_get_response_header(session->response, "Content-length")) { - snprintf(buf, + SNPRINTF(buf, 128, "%llu", (unsigned long long) session->response->total_size); @@ -512,7 +512,7 @@ MHD_build_header_response(struct MHD_Session * session) { char * data; MHD_add_extra_headers(session); - sprintf(code, + SPRINTF(code, "HTTP/1.1 %u\r\n", session->responseCode); off = strlen(code); @@ -530,7 +530,7 @@ MHD_build_header_response(struct MHD_Session * session) { off); pos = session->response->first_header; while (pos != NULL) { - sprintf(&data[off], + SPRINTF(&data[off], "%s: %s\r\n", pos->header, pos->value); @@ -567,7 +567,7 @@ MHD_session_handle_write(struct MHD_Session * session) { if (! session->headersSent) { if (session->write_buffer == NULL) MHD_build_header_response(session); - ret = send(session->socket_fd, + ret = SEND(session->socket_fd, &session->write_buffer[session->writeLoc], session->write_buffer_size - session->writeLoc, 0); @@ -576,8 +576,8 @@ MHD_session_handle_write(struct MHD_Session * session) { return MHD_YES; MHD_DLOG(session->daemon, "Failed to send data: %s\n", - strerror(errno)); - close(session->socket_fd); + STRERROR(errno)); + CLOSE(session->socket_fd); session->socket_fd = -1; return MHD_YES; } @@ -614,7 +614,7 @@ MHD_session_handle_write(struct MHD_Session * session) { if (ret == -1) { /* end of message, signal other side by closing! */ response->data_size = session->messagePos; - close(session->socket_fd); + CLOSE(session->socket_fd); session->socket_fd = -1; return MHD_YES; } @@ -625,7 +625,7 @@ MHD_session_handle_write(struct MHD_Session * session) { } /* transmit */ - ret = send(session->socket_fd, + ret = SEND(session->socket_fd, &response->data[session->messagePos - response->data_start], response->data_size - (session->messagePos - response->data_start), 0); @@ -636,8 +636,8 @@ MHD_session_handle_write(struct MHD_Session * session) { return MHD_YES; MHD_DLOG(session->daemon, "Failed to send data: %s\n", - strerror(errno)); - close(session->socket_fd); + STRERROR(errno)); + CLOSE(session->socket_fd); session->socket_fd = -1; return MHD_YES; } -- cgit v1.2.3