Changeset: 3cc700876422 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cc700876422
Modified Files:
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/multiplex-funnel.h
Branch: Jun2020
Log Message:
Use bool.
diffs (217 lines):
diff --git a/tools/merovingian/daemon/argvcmds.c
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -387,7 +387,7 @@ command_set(confkeyval *ckv, int argc, c
return(1);
}
if (strcmp(property, "passphrase") == 0) {
- char dohash = 1;
+ bool dohash = true;
/* allow to either set a hash ({X}xxx), or convert the given
* string to its hash */
if (*p == '{') {
@@ -401,10 +401,10 @@ command_set(confkeyval *ckv, int argc, c
return(1);
}
*q = '}';
- dohash = 0;
+ dohash = false;
}
}
- if (dohash == 1) {
+ if (dohash) {
p = mcrypt_BackendSum(p, strlen(p));
if(p) {
snprintf(h, sizeof(h), "{%s}%s",
MONETDB5_PASSWDHASH, p);
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
@@ -724,7 +724,7 @@ static void ctl_handle_client(
}
} else if (strchr(p, '=') != NULL) { /* set */
char *val;
- char doshare = 0;
+ bool doshare = false;
if ((e = msab_getStatus(&stats, q)) != NULL) {
len = snprintf(buf2, sizeof(buf2),
@@ -750,7 +750,7 @@ static void ctl_handle_client(
if (*val == '\0')
val = NULL;
- if ((doshare = !strcmp(p, "shared"))) {
+ if ((doshare = strcmp(p, "shared") == 0)) {
/* bail out if we don't do discovery at
all */
if (getConfNum(_mero_props,
"discovery") == 0) {
len = snprintf(buf2,
sizeof(buf2),
diff --git a/tools/merovingian/daemon/discoveryrunner.c
b/tools/merovingian/daemon/discoveryrunner.c
--- a/tools/merovingian/daemon/discoveryrunner.c
+++ b/tools/merovingian/daemon/discoveryrunner.c
@@ -45,12 +45,12 @@ broadcast(char *msg)
"message: %s\n", strerror(errno));
}
-static int
+static bool
removeRemoteDB(const char *dbname, const char *conn)
{
remotedb rdb;
remotedb prv;
- char hadmatch = 0;
+ bool hadmatch = false;
pthread_mutex_lock(&_mero_remotedb_lock);
@@ -80,7 +80,7 @@ removeRemoteDB(const char *dbname, const
free(rdb->fullname);
free(rdb);
rdb = prv;
- hadmatch = 1;
+ hadmatch = true;
/* in the future, there may be more, so keep looking */
}
prv = rdb;
@@ -475,7 +475,7 @@ discoveryRunner(void *d)
if (dbname == NULL || conn == NULL)
continue;
- if (removeRemoteDB(dbname, conn) == 0)
+ if (!removeRemoteDB(dbname, conn))
Mfprintf(_mero_discout,
"received leave request for
unknown database "
"%s%s from %s\n", conn, dbname,
host);
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
@@ -563,7 +563,7 @@ main(int argc, char *argv[])
#define MERO_EXIT(status)
\
do {
\
if (!merodontfork) {
\
- char s = status;
\
+ int s = status;
\
if (write(retfd, &s, 1) != 1 || close(retfd) != 0) {
\
Mfprintf(stderr, "could not write to
parent\n"); \
}
\
@@ -585,7 +585,7 @@ main(int argc, char *argv[])
#define MERO_EXIT_CLEAN(status)
\
do {
\
if (!merodontfork) {
\
- char s = status;
\
+ int s = status;
\
if (write(retfd, &s, 1) != 1 || close(retfd) != 0) {
\
Mfprintf(stderr, "could not write to
parent\n"); \
}
\
diff --git a/tools/merovingian/daemon/multiplex-funnel.c
b/tools/merovingian/daemon/multiplex-funnel.c
--- a/tools/merovingian/daemon/multiplex-funnel.c
+++ b/tools/merovingian/daemon/multiplex-funnel.c
@@ -187,7 +187,7 @@ MFconnectionManager(void *d)
m->dbcv[i]->database);
/* schedule to
drop connection */
m->dbcv[i]->newconn = NULL;
-
m->dbcv[i]->connupdate = 1;
+
m->dbcv[i]->connupdate = true;
continue;
}
/* walk all
connections, in an attempt to
@@ -216,7 +216,7 @@ MFconnectionManager(void *d)
mapi_destroy(tm);
/*
schedule connection for removal */
m->dbcv[i]->newconn = NULL;
-
m->dbcv[i]->connupdate = 1;
+
m->dbcv[i]->connupdate = true;
msab_freeStatus(&stats);
continue;
}
@@ -224,7 +224,7 @@ MFconnectionManager(void *d)
/* let the new
connection go live */
m->dbcv[i]->newconn = tm;
-
m->dbcv[i]->connupdate = 1;
+
m->dbcv[i]->connupdate = true;
}
msab_freeStatus(&stats);
}
@@ -292,7 +292,7 @@ multiplexInit(char *name, char *pattern,
m->tid = 0;
m->gdklock = -1;
- m->shutdown = 0;
+ m->shutdown = false;
m->name = strdup(name);
m->pool = strdup(pattern);
m->sout = sout;
@@ -340,7 +340,7 @@ multiplexInit(char *name, char *pattern,
m->dbcv[i]->database = p + 1;
m->dbcv[i]->conn = NULL;
m->dbcv[i]->newconn = NULL;
- m->dbcv[i]->connupdate = 0;
+ m->dbcv[i]->connupdate = false;
i++;
p = q + 1;
@@ -376,7 +376,7 @@ multiplexInit(char *name, char *pattern,
m->dbcv[i]->database = p + 1;
m->dbcv[i]->conn = NULL;
m->dbcv[i]->newconn = NULL;
- m->dbcv[i]->connupdate = 0;
+ m->dbcv[i]->connupdate = false;
}
}
@@ -512,7 +512,7 @@ multiplexDestroy(char *mp)
msab_dbnameinit(NULL);
/* signal the thread to stop and cleanup */
- m->shutdown = 1;
+ m->shutdown = true;
pthread_join(m->tid, NULL);
}
@@ -707,7 +707,7 @@ multiplexThread(void *d)
/* select on upstream clients, on new data, read query, forward,
* union all results, send back, and restart cycle. */
- while (m->shutdown == 0) {
+ while (!m->shutdown) {
#ifdef HAVE_POLL
msock = 0;
for (c = m->clients; c != NULL; c = c->next) {
@@ -749,7 +749,7 @@ multiplexThread(void *d)
mapi_destroy(m->dbcv[i]->conn);
m->dbcv[i]->conn = m->dbcv[i]->newconn;
m->dbcv[i]->newconn = NULL;
- m->dbcv[i]->connupdate = 0;
+ m->dbcv[i]->connupdate = false;
} else {
/* put new connection live */
Mfprintf(m->sout, "performing deferred
connection drop "
@@ -761,7 +761,7 @@ multiplexThread(void *d)
mapi_disconnect(m->dbcv[i]->conn);
mapi_destroy(m->dbcv[i]->conn);
m->dbcv[i]->conn = NULL;
- m->dbcv[i]->connupdate = 0;
+ m->dbcv[i]->connupdate = false;
}
}
}
diff --git a/tools/merovingian/daemon/multiplex-funnel.h
b/tools/merovingian/daemon/multiplex-funnel.h
--- a/tools/merovingian/daemon/multiplex-funnel.h
+++ b/tools/merovingian/daemon/multiplex-funnel.h
@@ -17,7 +17,7 @@
typedef struct _multiplex_database {
Mapi conn; /* current connection in use */
Mapi newconn; /* new connection we should set live (or NULL)
*/
- char connupdate; /* if set, we have to cycle newconn into conn */
+ bool connupdate; /* if set, we have to cycle newconn into conn */
char *user;
char *pass;
char *database;
@@ -35,7 +35,7 @@ typedef struct _multiplex_client {
typedef struct _multiplex {
pthread_t tid;
int gdklock;
- char shutdown;
+ bool shutdown;
char *name;
char *pool;
FILE *sout;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
