Changeset: 016f36dc273c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/016f36dc273c
Modified Files:
tools/merovingian/daemon/controlrunner.c
Branch: Jan2022
Log Message:
Do the error check correctly.
diffs (12 lines):
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -144,7 +144,7 @@ recvWithTimeout(int msgsock, stream *fdi
/* stream.h is sooo broken :( */
memset(buf, '\0', buflen);
ret = mnstr_read_block(fdin, buf, buflen - 1, 1);
- return(ret >= 0 ? (int)strlen(buf) : mnstr_errnr(fdin) < 0 ? -1
: 0);
+ return(ret >= 0 ? (int)strlen(buf) : mnstr_errnr(fdin) != 0 ?
-1 : 0);
} else {
return(recv(msgsock, buf, buflen, 0));
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]