Changeset: 46f98150cfc3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=46f98150cfc3
Modified Files:
tools/merovingian/daemon/client.c
tools/merovingian/daemon/merovingian.c
Branch: Jun2016
Log Message:
Layout.
diffs (53 lines):
diff --git a/tools/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -411,7 +411,7 @@ handleClient(void *data)
free(algos);
self->dead = 1;
return(e);
- };
+ }
}
msab_freeStatus(&top);
@@ -532,18 +532,18 @@ acceptConnections(int sock, int usock)
}
switch (*buf) {
- case '0':
- /* nothing special, nothing to do */
+ case '0':
+ /* nothing special, nothing to do */
break;
- case '1':
- /* filedescriptor, no way */
- close(msgsock);
- Mfprintf(stderr, "client error: fd
passing not supported\n");
+ case '1':
+ /* filedescriptor, no way */
+ close(msgsock);
+ Mfprintf(stderr, "client error: fd passing not
supported\n");
continue;
- default:
- /* some unknown state */
- close(msgsock);
- Mfprintf(stderr, "client error: unknown
initial byte\n");
+ default:
+ /* some unknown state */
+ close(msgsock);
+ Mfprintf(stderr, "client error: unknown initial
byte\n");
continue;
}
} else
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -204,7 +204,7 @@ logListener(void *x)
}
pthread_mutex_unlock(&_mero_topdp_lock);
-
+
if (select(nfds + 1, &readfds, NULL, NULL, &tv) <= 0) {
if (_mero_keep_logging != 0) {
continue;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
