Changeset cf7cca1 for lib

Timestamp:

11/08/18 14:31:51 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop, master

Children:

bc86030

Parents:

8d24b12

Message:

Better fix for unused variable problem in format_ndag.c

The previous one introduced bugs as the init_receivers()
function still needed to be called in all cases, even if the
return value of the function was later unused.

File:

• lib/format_ndag.c (modified) (1 diff)

lib/format_ndag.c

@@ -945 +945 @@
                 int *gottime, recvstream_t *rt) {
 
-        int ret, ndagstat;
+        int ret, ndagstat, avail;
         int toret = 0;
 
 #if HAVE_DECL_RECVMMSG
-        int i, avail;
+        int i;
 #endif
 
+        avail = init_receivers(ssock, ssock->bufavail);
 
 #if HAVE_DECL_RECVMMSG
-        avail = init_receivers(ssock, ssock->bufavail);
         ret = recvmmsg(ssock->sock, ssock->mmsgbufs, avail,
                         MSG_DONTWAIT, NULL);
 #else
+        if (avail != 1) {
+                return 0;
+        }
+
         ret = recvmsg(ssock->sock, &(ssock->singlemsg), MSG_DONTWAIT);
 #endif