diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 86d5cf9cc..73216669b 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.7: +- No more extra newlines to log_add() calls for libs/network/ code - SvdB - DUCK videos now play correctly after a video mode change; bug #734 - Alex - Cancel key will now quit out of the Manifest Menu (Bug #838) - Michael - Added -w and -x commandline options, to counter -f and -o; used these diff --git a/sc2/src/sc2code/libs/network/connect/connect.c b/sc2/src/sc2code/libs/network/connect/connect.c index 8d3dbad87..3742850e9 100644 --- a/sc2/src/sc2code/libs/network/connect/connect.c +++ b/sc2/src/sc2code/libs/network/connect/connect.c @@ -78,7 +78,7 @@ ConnectState_incRef(ConnectState *connectState) { assert(connectState->refCount < REFCOUNT_MAX); connectState->refCount++; #ifdef DEBUG_CONNECT_REF - log_add(log_Debug, "ConnectState %08" PRIxPTR ": ref++ (%d)\n", + log_add(log_Debug, "ConnectState %08" PRIxPTR ": ref++ (%d)", (uintptr_t) connectState, connectState->refCount); #endif } @@ -88,7 +88,7 @@ ConnectState_decRef(ConnectState *connectState) { assert(connectState->refCount > 0); connectState->refCount--; #ifdef DEBUG_CONNECT_REF - log_add(log_Debug, "ConnectState %08" PRIxPTR ": ref-- (%d)\n", + log_add(log_Debug, "ConnectState %08" PRIxPTR ": ref-- (%d)", (uintptr_t) connectState, connectState->refCount); #endif if (connectState->refCount == 0) { @@ -147,20 +147,20 @@ connectCallback(NetDescriptor *nd) { if (connectState->state == Connect_closed) { // The connection attempt has been aborted. #ifdef DEBUG - log_add(log_Debug, "Connection attempt was aborted.\n"); + log_add(log_Debug, "Connection attempt was aborted."); #endif ConnectState_decRef(connectState); return; } if (Socket_getError(NetDescriptor_getSocket(nd), &err) == -1) { - log_add(log_Fatal, "Socket_getError() failed: %s.\n", + log_add(log_Fatal, "Socket_getError() failed: %s.", strerror(errno)); explode(); } if (err != 0) { #ifdef DEBUG - log_add(log_Debug, "connect() failed: %s.\n", strerror(err)); + log_add(log_Debug, "connect() failed: %s.", strerror(err)); #endif NetDescriptor_close(nd); connectState->nd = NULL; @@ -169,6 +169,10 @@ connectCallback(NetDescriptor *nd) { return; } +#ifdef DEBUG + log_add(log_Debug, "Connection established."); +#endif + // Notify the higher layer. connectState->nd = NULL; // The callback function takes over ownership of the @@ -224,14 +228,14 @@ tryConnectHostNext(ConnectState *connectState) { info->ai_protocol); if (sock == Socket_noSocket) { int savedErrno = errno; - log_add(log_Error, "socket() failed: %s.\n", strerror(errno)); + log_add(log_Error, "socket() failed: %s.", strerror(errno)); errno = savedErrno; return Socket_noSocket; } if (Socket_setNonBlocking(sock) == -1) { int savedErrno = errno; - log_add(log_Error, "Could not make socket non-blocking: %s.\n", + log_add(log_Error, "Could not make socket non-blocking: %s.", strerror(errno)); errno = savedErrno; return Socket_noSocket; @@ -268,7 +272,7 @@ tryConnectHostNext(ConnectState *connectState) { Socket_close(sock); #ifdef DEBUG log_add(log_Debug, "connect() immediately failed for one address: " - "%s.\n", strerror(errno)); + "%s.", strerror(errno)); // TODO: add the address in the status message. #endif errno = savedErrno; @@ -327,7 +331,7 @@ connectHostNext(ConnectState *connectState) { ConnectError error; int savedErrno = errno; - log_add(log_Error, "NetDescriptor_new() failed: %s.\n", + log_add(log_Error, "NetDescriptor_new() failed: %s.", strerror(errno)); Socket_close(sock); freeaddrinfo(connectState->info); @@ -438,7 +442,7 @@ connectHostByName(const char *host, const char *service, Protocol proto, connectState = ConnectState_alloc(); connectState->refCount = 1; #ifdef DEBUG_CONNECT_REF - log_add(log_Debug, "ConnectState %08" PRIxPTR ": ref=1 (%d)\n", + log_add(log_Debug, "ConnectState %08" PRIxPTR ": ref=1 (%d)", (uintptr_t) connectState, connectState->refCount); #endif connectState->state = Connect_resolving; diff --git a/sc2/src/sc2code/libs/network/connect/listen.c b/sc2/src/sc2code/libs/network/connect/listen.c index 860d651df..0016fad31 100644 --- a/sc2/src/sc2code/libs/network/connect/listen.c +++ b/sc2/src/sc2code/libs/network/connect/listen.c @@ -74,7 +74,7 @@ ListenState_incRef(ListenState *listenState) { assert(listenState->refCount < REFCOUNT_MAX); listenState->refCount++; #ifdef DEBUG_LISTEN_REF - log_add(log_Debug, "ListenState %08" PRIxPTR ": ref++ (%d)\n", + log_add(log_Debug, "ListenState %08" PRIxPTR ": ref++ (%d)", (uintptr_t) listenState, listenState->refCount); #endif } @@ -84,7 +84,7 @@ ListenState_decRef(ListenState *listenState) { assert(listenState->refCount > 0); listenState->refCount--; #ifdef DEBUG_LISTEN_REF - log_add(log_Debug, "ListenState %08" PRIxPTR ": ref-- (%d)\n", + log_add(log_Debug, "ListenState %08" PRIxPTR ": ref-- (%d)", (uintptr_t) listenState, listenState->refCount); #endif if (listenState->refCount == 0) { @@ -134,7 +134,7 @@ listenPortSingle(struct ListenState *listenState, struct addrinfo *info) { info->ai_protocol); if (sock == Socket_noSocket) { int savedErrno = errno; - log_add(log_Error, "socket() failed: %s.\n", strerror(errno)); + log_add(log_Error, "socket() failed: %s.", strerror(errno)); errno = savedErrno; return NULL; } @@ -154,10 +154,10 @@ listenPortSingle(struct ListenState *listenState, struct addrinfo *info) { int savedErrno = errno; if (errno == EADDRINUSE) { #ifdef DEBUG - log_add(log_Warning, "bind() failed: %s.\n", strerror(errno)); + log_add(log_Warning, "bind() failed: %s.", strerror(errno)); #endif } else - log_add(log_Error, "bind() failed: %s.\n", strerror(errno)); + log_add(log_Error, "bind() failed: %s.", strerror(errno)); Socket_close(sock); errno = savedErrno; return NULL; @@ -166,7 +166,7 @@ listenPortSingle(struct ListenState *listenState, struct addrinfo *info) { listenResult = Socket_listen(sock, listenState->flags.backlog); if (listenResult == -1) { int savedErrno = errno; - log_add(log_Error, "listen() failed: %s.\n", strerror(errno)); + log_add(log_Error, "listen() failed: %s.", strerror(errno)); Socket_close(sock); errno = savedErrno; return NULL; @@ -175,7 +175,7 @@ listenPortSingle(struct ListenState *listenState, struct addrinfo *info) { nd = NetDescriptor_new(sock, (void *) listenState); if (nd == NULL) { int savedErrno = errno; - log_add(log_Error, "NetDescriptor_new() failed: %s.\n", + log_add(log_Error, "NetDescriptor_new() failed: %s.", strerror(errno)); Socket_close(sock); errno = savedErrno; @@ -226,7 +226,7 @@ listenPortMulti(struct ListenState *listenState, struct addrinfo *info) { // it's a real possibility. if (errno == EADDRINUSE && addrOkCount == 0) { log_add(log_Error, "Error while preparing a network socket " - "for incoming connections: %s\n", strerror(errno)); + "for incoming connections: %s", strerror(errno)); } continue; } @@ -312,7 +312,7 @@ listenPort(const char *service, Protocol proto, const ListenFlags *flags, listenState = ListenState_alloc(); listenState->refCount = 1; #ifdef DEBUG_LISTEN_REF - log_add(log_Debug, "ListenState %08" PRIxPTR ": ref=1 (%d)\n", + log_add(log_Debug, "ListenState %08" PRIxPTR ": ref=1 (%d)", (uintptr_t) listenState, listenState->refCount); #endif listenState->state = Listen_resolving; @@ -382,13 +382,13 @@ acceptSingleConnection(ListenState *listenState, NetDescriptor *nd) { #endif // Serious problems, but future connections may still // be possible. - log_add(log_Warning, "accept() reported '%s'\n", + log_add(log_Warning, "accept() reported '%s'", strerror(errno)); return; default: // Should not happen. log_add(log_Fatal, "Internal error: accept() reported " - "'%s'\n", strerror(errno)); + "'%s'", strerror(errno)); explode(); } } @@ -397,7 +397,7 @@ acceptSingleConnection(ListenState *listenState, NetDescriptor *nd) { // Ignore errors; it's not a big deal. if (Socket_setNonBlocking(acceptResult) == -1) { int savedErrno = errno; - log_add(log_Error, "Could not make socket non-blocking: %s.\n", + log_add(log_Error, "Could not make socket non-blocking: %s.", strerror(errno)); Socket_close(acceptResult); errno = savedErrno; @@ -418,11 +418,11 @@ acceptSingleConnection(ListenState *listenState, NetDescriptor *nd) { hostname, sizeof hostname, NULL, 0, 0); if (gniRes != 0) { log_add(log_Error, "Error while performing hostname " - "lookup for incoming connection: %s\n", + "lookup for incoming connection: %s", (gniRes == EAI_SYSTEM) ? strerror(errno) : gai_strerror(gniRes)); } else { - log_add(log_Debug, "Accepted incoming connection from '%s'.\n", + log_add(log_Debug, "Accepted incoming connection from '%s'.", hostname); } } @@ -431,7 +431,7 @@ acceptSingleConnection(ListenState *listenState, NetDescriptor *nd) { newNd = NetDescriptor_new(acceptResult, NULL); if (newNd == NULL) { int savedErrno = errno; - log_add(log_Error, "NetDescriptor_new() failed: %s.\n", + log_add(log_Error, "NetDescriptor_new() failed: %s.", strerror(errno)); Socket_close(acceptResult); errno = savedErrno; diff --git a/sc2/src/sc2code/libs/network/connect/resolve.c b/sc2/src/sc2code/libs/network/connect/resolve.c index e1259e709..f9a5d4e30 100644 --- a/sc2/src/sc2code/libs/network/connect/resolve.c +++ b/sc2/src/sc2code/libs/network/connect/resolve.c @@ -51,7 +51,7 @@ ResolveState_incRef(ResolveState *resolveState) { assert(resolveState->refCount < REFCOUNT_MAX); resolveState->refCount++; #ifdef DEBUG_RESOLVE_REF - log_add(log_Debug, "ResolveState %08" PRIxPTR ": ref++ (%d)\n", + log_add(log_Debug, "ResolveState %08" PRIxPTR ": ref++ (%d)", (uintptr_t) resolveState, resolveState->refCount); #endif } @@ -61,7 +61,7 @@ ResolveState_decRef(ResolveState *resolveState) { assert(resolveState->refCount > 0); resolveState->refCount--; #ifdef DEBUG_RESOLVE_REF - log_add(log_Debug, "ResolveState %08" PRIxPTR ": ref-- (%d)\n", + log_add(log_Debug, "ResolveState %08" PRIxPTR ": ref-- (%d)", (uintptr_t) resolveState, resolveState->refCount); #endif if (resolveState->refCount == 0) { @@ -129,7 +129,7 @@ getaddrinfoAsync(const char *node, const char *service, resolveState = ResolveState_new(); resolveState->refCount = 1; #ifdef DEBUG_RESOLVE_REF - log_add(log_Debug, "ResolveState %08" PRIxPTR ": ref=1 (%d)\n", + log_add(log_Debug, "ResolveState %08" PRIxPTR ": ref=1 (%d)", (uintptr_t) resolveState, resolveState->refCount); #endif resolveState->state = Resolve_resolving; diff --git a/sc2/src/sc2code/libs/network/netmanager/ndesc.c b/sc2/src/sc2code/libs/network/netmanager/ndesc.c index c44369153..e407ff9be 100644 --- a/sc2/src/sc2code/libs/network/netmanager/ndesc.c +++ b/sc2/src/sc2code/libs/network/netmanager/ndesc.c @@ -51,7 +51,7 @@ NetDescriptor_new(Socket *socket, void *extra) { nd = NetDescriptor_alloc(); nd->refCount = 1; #ifdef DEBUG_NETDESCRIPTOR_REF - log_add(log_Debug, "NetDescriptor %08" PRIxPTR ": ref=1 (%d)\n", + log_add(log_Debug, "NetDescriptor %08" PRIxPTR ": ref=1 (%d)", (uintptr_t) nd, nd->refCount); #endif @@ -117,7 +117,7 @@ NetDescriptor_incRef(NetDescriptor *nd) { assert(nd->refCount < REFCOUNT_MAX); nd->refCount++; #ifdef DEBUG_NETDESCRIPTOR_REF - log_add(log_Debug, "NetDescriptor %08" PRIxPTR ": ref++ (%d)\n", + log_add(log_Debug, "NetDescriptor %08" PRIxPTR ": ref++ (%d)", (uintptr_t) nd, nd->refCount); #endif } @@ -128,7 +128,7 @@ NetDescriptor_decRef(NetDescriptor *nd) { assert(nd->refCount > 0); nd->refCount--; #ifdef DEBUG_NETDESCRIPTOR_REF - log_add(log_Debug, "NetDescriptor %08" PRIxPTR ": ref-- (%d)\n", + log_add(log_Debug, "NetDescriptor %08" PRIxPTR ": ref-- (%d)", (uintptr_t) nd, nd->refCount); #endif if (nd->refCount == 0) { diff --git a/sc2/src/sc2code/libs/network/netmanager/netmanager_bsd.c b/sc2/src/sc2code/libs/network/netmanager/netmanager_bsd.c index a5808889c..29159f8f0 100644 --- a/sc2/src/sc2code/libs/network/netmanager/netmanager_bsd.c +++ b/sc2/src/sc2code/libs/network/netmanager/netmanager_bsd.c @@ -154,7 +154,7 @@ NetManager_process(uint32 *timeoutMs) { } while (selectResult == -1 && errno == EINTR); if (selectResult == -1) { int savedErrno = errno; - log_add(log_Error, "select() failed: %s.\n", strerror(errno)); + log_add(log_Error, "select() failed: %s.", strerror(errno)); errno = savedErrno; *timeoutMs = (timeout.tv_sec * 1000) + (timeout.tv_usec / 1000); // XXX: rounding microseconds down. Is that the correct diff --git a/sc2/src/sc2code/libs/network/netmanager/netmanager_win.c b/sc2/src/sc2code/libs/network/netmanager/netmanager_win.c index b884fde04..f1467326f 100644 --- a/sc2/src/sc2code/libs/network/netmanager/netmanager_win.c +++ b/sc2/src/sc2code/libs/network/netmanager/netmanager_win.c @@ -89,7 +89,7 @@ closeWSAEvent(WSAEVENT event) { error = WSAGetLastError(); if (error != WSAEINPROGRESS) { log_add(log_Error, - "WSACloseEvent() failed with error code %d.\n", error); + "WSACloseEvent() failed with error code %d.", error); errno = winsockErrorToErrno(error); return -1; } @@ -137,7 +137,7 @@ NetManager_addDesc(NetDescriptor *nd) { int savedErrno = getWinsockErrno(); int closeStatus = closeWSAEvent(event); if (closeStatus == -1) { - log_add(log_Fatal, "closeWSAEvent() failed: %s.\n", + log_add(log_Fatal, "closeWSAEvent() failed: %s.", strerror(errno)); explode(); } @@ -224,7 +224,7 @@ NetManager_updateEvent(NetDescriptor *nd) { int savedErrno = getWinsockErrno(); int closeStatus = closeWSAEvent(events[nd->smd->index]); if (closeStatus == -1) { - log_add(log_Fatal, "closeWSAEvent() failed: %s.\n", + log_add(log_Fatal, "closeWSAEvent() failed: %s.", strerror(errno)); explode(); } @@ -265,7 +265,7 @@ activateSomeCallback(NetDescriptor *nd, long eventMask) { { int status = NetManager_updateEvent(nd); if (status == -1) { - log_add(log_Fatal, "NetManager_updateEvent() failed: %s.\n", + log_add(log_Fatal, "NetManager_updateEvent() failed: %s.", strerror(errno)); explode(); // TODO: better error handling. @@ -279,7 +279,7 @@ deactivateSomeCallback(NetDescriptor *nd, long eventMask) { { int status = NetManager_updateEvent(nd); if (status == -1) { - log_add(log_Fatal, "NetManager_updateEvent() failed: %s.\n", + log_add(log_Fatal, "NetManager_updateEvent() failed: %s.", strerror(errno)); explode(); // TODO: better error handling diff --git a/sc2/src/sc2code/libs/network/network_win.c b/sc2/src/sc2code/libs/network/network_win.c index e54394678..a5c6abf4c 100644 --- a/sc2/src/sc2code/libs/network/network_win.c +++ b/sc2/src/sc2code/libs/network/network_win.c @@ -35,23 +35,23 @@ Network_init(void) { startupResult = WSAStartup(requestVersion, &data); if (startupResult != 0) { int savedErrno = winsockErrorToErrno(startupResult); - log_add(log_Fatal, "WSAStartup failed.\n"); + log_add(log_Fatal, "WSAStartup failed."); errno = savedErrno; explode(); } #ifdef DEBUG - log_add(log_Debug, "Winsock version %d.%d found: \"%s\".\n", + log_add(log_Debug, "Winsock version %d.%d found: \"%s\".", LOBYTE(data.wHighVersion), HIBYTE(data.wHighVersion), data.szDescription); log_add(log_Debug, "Requesting to use Winsock version %d.%d, got " - "version %d.%d.\n", + "version %d.%d.", LOBYTE(requestVersion), HIBYTE(requestVersion), LOBYTE(data.wVersion), HIBYTE(data.wVersion)); #endif if (data.wVersion != requestVersion) { log_add(log_Fatal, "Winsock version %d.%d presented, requested " - "%d.%d.\n", LOBYTE(data.wVersion), HIBYTE(data.wVersion), + "%d.%d.", LOBYTE(data.wVersion), HIBYTE(data.wVersion), LOBYTE(requestVersion), HIBYTE(requestVersion)); (void) WSACleanup(); // Ignoring errors; we're going to abort anyhow. @@ -66,7 +66,7 @@ Network_uninit(void) { cleanupResult = WSACleanup(); if (cleanupResult == SOCKET_ERROR) { int savedErrno = getWinsockErrno(); - log_add(log_Fatal, "WSACleanup failed.\n"); + log_add(log_Fatal, "WSACleanup failed."); errno = savedErrno; explode(); } diff --git a/sc2/src/sc2code/libs/network/socket/socket_bsd.c b/sc2/src/sc2code/libs/network/socket/socket_bsd.c index b6f22b8da..f5def5881 100644 --- a/sc2/src/sc2code/libs/network/socket/socket_bsd.c +++ b/sc2/src/sc2code/libs/network/socket/socket_bsd.c @@ -142,7 +142,7 @@ Socket_setNonBlocking(Socket *sock) { if (flags == -1) { int savedErrno = errno; log_add(log_Error, "Getting file descriptor flags of socket failed: " - "%s.\n", strerror(errno)); + "%s.", strerror(errno)); errno = savedErrno; return -1; } @@ -150,7 +150,7 @@ Socket_setNonBlocking(Socket *sock) { if (fcntl(sock->fd, F_SETFL, flags | O_NONBLOCK) == -1) { int savedErrno = errno; log_add(log_Error, "Setting non-blocking mode on socket failed: " - "%s.\n", strerror(errno)); + "%s.", strerror(errno)); errno = savedErrno; return -1; } @@ -165,7 +165,7 @@ Socket_setReuseAddr(Socket *sock) { if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof flag) == -1) { int savedErrno = errno; - log_add(log_Error, "Setting socket reuse failed: %s.\n", + log_add(log_Error, "Setting socket reuse failed: %s.", strerror(errno)); errno = savedErrno; return -1; @@ -183,7 +183,7 @@ Socket_setNodelay(Socket *sock) { == -1) { #ifdef DEBUG int savedErrno = errno; - log_add(log_Warning, "Disabling Nagle algorithm failed: %s.\n", + log_add(log_Warning, "Disabling Nagle algorithm failed: %s.", strerror(errno)); errno = savedErrno; #endif @@ -199,7 +199,7 @@ Socket_setTOS(Socket *sock, int tos) { if (setsockopt(sock->fd, IPPROTO_IP, IP_TOS, &tos, sizeof tos) == -1) { #ifdef DEBUG int savedErrno = errno; - log_add(log_Warning, "Setting socket type-of-service failed: %s.\n", + log_add(log_Warning, "Setting socket type-of-service failed: %s.", strerror(errno)); errno = savedErrno; #endif @@ -231,7 +231,7 @@ Socket_setInlineOOB(Socket *sock) { if (setsockopt(sock->fd, SOL_SOCKET, SO_OOBINLINE, &flag, sizeof flag) == -1) { int savedErrno = errno; - log_add(log_Error, "Setting inline OOB on socket failed: %s\n", + log_add(log_Error, "Setting inline OOB on socket failed: %s", strerror(errno)); errno = savedErrno; return -1; @@ -246,7 +246,7 @@ Socket_setKeepAlive(Socket *sock) { if (setsockopt(sock->fd, IPPROTO_TCP, SO_KEEPALIVE, &flag, sizeof flag) == -1) { int savedErrno = errno; - log_add(log_Error, "Setting keep-alive on socket failed: %s\n", + log_add(log_Error, "Setting keep-alive on socket failed: %s", strerror(errno)); errno = savedErrno; return -1; diff --git a/sc2/src/sc2code/libs/network/socket/socket_win.c b/sc2/src/sc2code/libs/network/socket/socket_win.c index 4b011ea7e..7c8ee3b2d 100644 --- a/sc2/src/sc2code/libs/network/socket/socket_win.c +++ b/sc2/src/sc2code/libs/network/socket/socket_win.c @@ -178,7 +178,7 @@ Socket_setNonBlocking(Socket *sock) { if (ioctlsocket(sock->sock, FIONBIO, &flag) == SOCKET_ERROR) { int savedErrno = getWinsockErrno(); - log_add(log_Error, "Setting non-block mode on socket failed: %s.\n", + log_add(log_Error, "Setting non-block mode on socket failed: %s.", strerror(errno)); errno = savedErrno; return -1; @@ -193,7 +193,7 @@ Socket_setReuseAddr(Socket *sock) { if (setsockopt(sock->sock, SOL_SOCKET, SO_REUSEADDR, (const char *) &flag, sizeof flag) == SOCKET_ERROR) { int savedErrno = getWinsockErrno(); - log_add(log_Error, "Setting socket reuse failed: %s.\n", + log_add(log_Error, "Setting socket reuse failed: %s.", strerror(errno)); errno = savedErrno; return -1; @@ -211,7 +211,7 @@ Socket_setNodelay(Socket *sock) { (const char *) &flag, sizeof flag) == SOCKET_ERROR) { #ifdef DEBUG int savedErrno = getWinsockErrno(); - log_add(log_Warning, "Disabling Nagle algorithm failed: %s.\n", + log_add(log_Warning, "Disabling Nagle algorithm failed: %s.", strerror(errno)); errno = savedErrno; #endif @@ -245,7 +245,7 @@ Socket_setInlineOOB(Socket *sock) { if (setsockopt(sock->sock, SOL_SOCKET, SO_OOBINLINE, (const char *) &flag, sizeof flag) == SOCKET_ERROR) { int savedErrno = getWinsockErrno(); - log_add(log_Error, "Setting inline OOB on socket failed: %s\n", + log_add(log_Error, "Setting inline OOB on socket failed: %s", strerror(errno)); errno = savedErrno; return -1; @@ -260,7 +260,7 @@ Socket_setKeepAlive(Socket *sock) { if (setsockopt(sock->sock, IPPROTO_TCP, SO_KEEPALIVE, (const char *) &flag, sizeof flag) == SOCKET_ERROR) { int savedErrno = getWinsockErrno(); - log_add(log_Error, "Setting keep-alive on socket failed: %s\n", + log_add(log_Error, "Setting keep-alive on socket failed: %s", strerror(errno)); errno = savedErrno; return -1;