From 8b20725dfb647ac5af5122782993a704213bb50c Mon Sep 17 00:00:00 2001 From: agc Date: Sun, 2 Apr 2006 09:36:57 +0000 Subject: [PATCH] Fix a (repeated) obvious bug in the tracing functions. Modify the return values of some boolean functions to be 1 for success, 0 for failure, rather than 0 and -1 respectively. --- dist/iscsi/src/initiator.c | 4 +-- dist/iscsi/src/target.c | 21 +++++++-------- dist/iscsi/src/util.c | 54 ++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 42 deletions(-) diff --git a/dist/iscsi/src/initiator.c b/dist/iscsi/src/initiator.c index 11e054ad1946..d32218ce10d5 100644 --- a/dist/iscsi/src/initiator.c +++ b/dist/iscsi/src/initiator.c @@ -202,11 +202,11 @@ session_init_i(initiator_session_t ** sess, uint64_t isid) /* Create socket */ - if (iscsi_sock_create(&s->sock) != 0) { + if (!iscsi_sock_create(&s->sock)) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_create() failed\n"); return -1; } - if (iscsi_sock_setsockopt(&s->sock, SOL_TCP, TCP_NODELAY, &one, sizeof(one)) != 0) { + if (!iscsi_sock_setsockopt(&s->sock, SOL_TCP, TCP_NODELAY, &one, sizeof(one))) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_setsockopt() failed\n"); return -1; } diff --git a/dist/iscsi/src/target.c b/dist/iscsi/src/target.c index 390cddd234a8..b59d07dde610 100644 --- a/dist/iscsi/src/target.c +++ b/dist/iscsi/src/target.c @@ -1544,24 +1544,23 @@ target_listen(globals_t *gp) iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "listener thread started\n"); /* Create/Bind/Listen */ - - if (iscsi_sock_create(&gp->sock) < 0) { + if (!iscsi_sock_create(&gp->sock)) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_create() failed\n"); goto done; } - if (iscsi_sock_setsockopt(&gp->sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) != 0) { + if (!iscsi_sock_setsockopt(&gp->sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_setsockopt() failed\n"); goto done; } - if (iscsi_sock_setsockopt(&gp->sock, SOL_TCP, TCP_NODELAY, &one, sizeof(one)) != 0) { + if (!iscsi_sock_setsockopt(&gp->sock, SOL_TCP, TCP_NODELAY, &one, sizeof(one))) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_setsockopt() failed\n"); return -1; } - if (iscsi_sock_bind(gp->sock, gp->port) < 0) { + if (!iscsi_sock_bind(gp->sock, gp->port)) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_bind() failed\n"); goto done; } - if (iscsi_sock_listen(gp->sock) < 0) { + if (!iscsi_sock_listen(gp->sock)) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_listen() failed\n"); goto done; } @@ -1585,23 +1584,23 @@ target_listen(globals_t *gp) /* Accept connection, spawn session thread, and */ /* clean up old threads */ - iscsi_trace(TRACE_NET_DEBUG, __FILE__, __LINE__, "waiting for IPv4 connection on port %d\n", ISCSI_HTONS(gp->port)); - if (iscsi_sock_accept(gp->sock, &sess->sock) < 0) { + iscsi_trace(TRACE_NET_DEBUG, __FILE__, __LINE__, "waiting for IPv4 connection on port %hd\n", gp->port); + if (!iscsi_sock_accept(gp->sock, &sess->sock)) { iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "iscsi_sock_accept() failed\n"); goto done; } localAddrLen = sizeof(localAddrStorage); (void) memset(&localAddrStorage, 0x0, sizeof(localAddrStorage)); - if (iscsi_sock_getsockname(sess->sock, (struct sockaddr *) (void *) &localAddrStorage, &localAddrLen) < 0) { + if (!iscsi_sock_getsockname(sess->sock, (struct sockaddr *) (void *) &localAddrStorage, &localAddrLen)) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_getsockname() failed\n"); goto done; } remoteAddrLen = sizeof(remoteAddrStorage); (void) memset(&remoteAddrStorage, 0x0, sizeof(remoteAddrStorage)); - if (iscsi_sock_getpeername(sess->sock, (struct sockaddr *) (void *) &remoteAddrStorage, &remoteAddrLen) < 0) { - iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_getsockname() failed\n"); + if (!iscsi_sock_getpeername(sess->sock, (struct sockaddr *) (void *) &remoteAddrStorage, &remoteAddrLen)) { + iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_getpeername() failed\n"); goto done; } diff --git a/dist/iscsi/src/util.c b/dist/iscsi/src/util.c index 852e2da40a06..48e38fc0c81c 100644 --- a/dist/iscsi/src/util.c +++ b/dist/iscsi/src/util.c @@ -98,7 +98,7 @@ iscsi_malloc_atomic(unsigned n) void *ptr; ptr = malloc(n); - iscsi_trace(TRACE_MEM, __FILE__, __LINE__, "iscsi_malloc_atomic(%i) = 0x%p\n", n, ptr); + iscsi_trace(TRACE_MEM, __FILE__, __LINE__, "iscsi_malloc_atomic(%u) = %p\n", n, ptr); return ptr; } @@ -108,7 +108,7 @@ iscsi_malloc(unsigned n) void *ptr; ptr = malloc(n); - iscsi_trace(TRACE_MEM, __FILE__, __LINE__, "iscsi_malloc_atomic(%i) = 0x%p\n", n, ptr); + iscsi_trace(TRACE_MEM, __FILE__, __LINE__, "iscsi_malloc(%u) = %p\n", n, ptr); return ptr; } @@ -116,14 +116,14 @@ void iscsi_free_atomic(void *ptr) { (void) free(ptr); - iscsi_trace(TRACE_MEM, __FILE__, __LINE__, "iscsi_free_atomic(0x%p)\n", ptr); + iscsi_trace(TRACE_MEM, __FILE__, __LINE__, "iscsi_free_atomic(%p)\n", ptr); } void iscsi_free(void *ptr) { (void) free(ptr); - iscsi_trace(TRACE_MEM, __FILE__, __LINE__, "iscsi_free(0x%p)\n", ptr); + iscsi_trace(TRACE_MEM, __FILE__, __LINE__, "iscsi_free(%p)\n", ptr); } /* debugging levels */ @@ -168,7 +168,7 @@ iscsi_queue_init(iscsi_queue_t * q, int depth) { q->head = q->tail = q->count = 0; q->depth = depth; - if ((q->elem = iscsi_malloc_atomic(depth * sizeof(void *))) == NULL) { + if ((q->elem = iscsi_malloc_atomic((unsigned)(depth * sizeof(void *)))) == NULL) { iscsi_trace_error(__FILE__, __LINE__, "iscsi_malloc_atomic() failed\n"); return -1; } @@ -245,7 +245,7 @@ iscsi_trace(const int trace, const char *f, const int line, const char *fmt, ... if (iscsi_debug_level & trace) { va_start(vp, fmt); - (void) snprintf(buf, sizeof(buf), fmt, vp); + (void) vsnprintf(buf, sizeof(buf), fmt, vp); printf("pid %d:%s:%d: %s", (int) ISCSI_GETPID, f, line, buf); @@ -263,7 +263,7 @@ iscsi_trace_warning(const char *f, const int line, const char *fmt, ...) if (iscsi_debug_level & TRACE_WARN) { va_start(vp, fmt); - (void) snprintf(buf, sizeof(buf), fmt, vp); + (void) vsnprintf(buf, sizeof(buf), fmt, vp); printf("pid %d:%s:%d: ***WARNING*** %s", (int) ISCSI_GETPID, f, line, buf); @@ -280,7 +280,7 @@ iscsi_trace_error(const char *f, const int line, const char *fmt, ...) char buf[8192]; va_start(vp, fmt); - (void) snprintf(buf, sizeof(buf), fmt, vp); + (void) vsnprintf(buf, sizeof(buf), fmt, vp); va_end(vp); printf("pid %d:%s:%d: ***ERROR*** %s", (int) ISCSI_GETPID, f, line, buf); # ifdef HAVE_SYSLOG @@ -484,9 +484,9 @@ iscsi_sock_setsockopt(iscsi_socket_t * sock, int level, int optname, void *optva if ((rc = setsockopt(*sock, level, optname, optval, optlen)) != 0) { iscsi_trace_error(__FILE__, __LINE__, "sock->ops->setsockopt() failed: rc %i errno %i\n", rc, errno); - return -1; + return 0; } - return 0; + return 1; } int @@ -496,9 +496,9 @@ iscsi_sock_getsockopt(iscsi_socket_t * sock, int level, int optname, void *optva if ((rc = getsockopt(*sock, level, optname, optval, optlen)) != 0) { iscsi_trace_error(__FILE__, __LINE__, "sock->ops->getsockopt() failed: rc %i errno %i\n", rc, errno); - return -1; + return 0; } - return 0; + return 1; } int @@ -506,15 +506,11 @@ iscsi_sock_create(iscsi_socket_t * sock) { int rc; - if ((rc = socket(AF_INET, SOCK_STREAM, 0)) < 0) { + if ((*sock = rc = socket(AF_INET, SOCK_STREAM, 0)) < 0) { iscsi_trace_error(__FILE__, __LINE__, "socket() failed: rc %i errno %i\n", rc, errno); + return 0; } - *sock = rc; - if (rc < 0) { - iscsi_trace_error(__FILE__, __LINE__, "error creating socket (rc %i)\n", rc); - return -1; - } - return 0; + return 1; } int @@ -529,9 +525,9 @@ iscsi_sock_bind(iscsi_socket_t sock, int port) laddr.sin_port = ISCSI_HTONS(port); if ((rc = bind(sock, (struct sockaddr *) (void *) &laddr, sizeof(laddr))) < 0) { iscsi_trace_error(__FILE__, __LINE__, "bind() failed: rc %i errno %i\n", rc, errno); - return -1; + return 0; } - return 0; + return 1; } int @@ -541,9 +537,9 @@ iscsi_sock_listen(iscsi_socket_t sock) if ((rc = listen(sock, 32)) < 0) { iscsi_trace_error(__FILE__, __LINE__, "listen() failed: rc %i errno %i\n", rc, errno); - return -1; + return 0; } - return 0; + return 1; } int @@ -556,10 +552,10 @@ iscsi_sock_accept(iscsi_socket_t sock, iscsi_socket_t * newsock) (void) memset(&remoteAddr, 0, sizeof(remoteAddr)); if ((*newsock = accept(sock, (struct sockaddr *) (void *)& remoteAddr, &remoteAddrLen)) < 0) { iscsi_trace(TRACE_NET_DEBUG, __FILE__, __LINE__, "accept() failed: rc %i errno %i\n", *newsock, errno); - return -1; + return 0; } - return 0; + return 1; } int @@ -567,9 +563,9 @@ iscsi_sock_getsockname(iscsi_socket_t sock, struct sockaddr * name, unsigned *na { if (getsockname(sock, name, namelen) != 0) { iscsi_trace_error(__FILE__, __LINE__, "getsockame() failed (errno %i)\n", errno); - return -1; + return 0; } - return 0; + return 1; } int @@ -577,9 +573,9 @@ iscsi_sock_getpeername(iscsi_socket_t sock, struct sockaddr * name, unsigned *na { if (getpeername(sock, name, namelen) != 0) { iscsi_trace_error(__FILE__, __LINE__, "getpeername() failed (errno %i)\n", errno); - return -1; + return 0; } - return 0; + return 1; } int