Changeset: 94e5e1173f27 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/94e5e1173f27
Modified Files:
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/controlrunner.h
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/utils/control.c
tools/merovingian/utils/control.h
tools/merovingian/utils/glob.c
tools/merovingian/utils/glob.h
Branch: Jan2022
Log Message:
Use bool.
diffs (299 lines):
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -249,7 +249,7 @@ MEROgetStatus(sabdb **ret, char *databas
database = "#all";
e = control_send(&buf, mero_host, mero_port,
- database, "status", 1, mero_pass);
+ database, "status", true, mero_pass);
if (e != NULL)
return(e);
@@ -594,7 +594,7 @@ simple_argv_cmd(char *cmd, sabdb *dbs, c
}
ret = control_send(&out, mero_host, mero_port,
- dbs->dbname, merocmd, 0, mero_pass);
+ dbs->dbname, merocmd, false, mero_pass);
if (ret != NULL) {
if (premsg != NULL && !monetdb_quiet)
@@ -955,7 +955,7 @@ command_discover(int argc, char *argv[])
* which help each other, just like merovingians do among each
* other. */
p = control_send(&buf, mero_host, mero_port,
- "anelosimus", "eximius", 1, mero_pass);
+ "anelosimus", "eximius", true, mero_pass);
if (p != NULL) {
printf("%s: %s\n", argv[0], p);
free(p);
@@ -1246,7 +1246,7 @@ command_set(int argc, char *argv[], mero
}
out = control_send(&res, mero_host, mero_port,
- orig->dbname, p, 0, mero_pass);
+ orig->dbname, p, false, mero_pass);
if (out != NULL || strcmp(res, "OK") != 0) {
res = out == NULL ? res : out;
fprintf(stderr, "%s: %s\n", argv[0], res);
@@ -1264,7 +1264,7 @@ command_set(int argc, char *argv[], mero
p = property;
}
out = control_send(&res, mero_host, mero_port,
- stats->dbname, p, 0, mero_pass);
+ stats->dbname, p, false, mero_pass);
if (out != NULL || strcmp(res, "OK") != 0) {
res = out == NULL ? res : out;
fprintf(stderr, "%s: %s\n", argv[0], res);
@@ -1365,7 +1365,7 @@ command_get(int argc, char *argv[])
}
e = control_send(&buf, mero_host, mero_port,
- "#defaults", "get", 1, mero_pass);
+ "#defaults", "get", true, mero_pass);
if (e != NULL) {
fprintf(stderr, "get: %s\n", e);
free(e);
@@ -1393,7 +1393,7 @@ command_get(int argc, char *argv[])
stats = orig;
while (stats != NULL) {
e = control_send(&buf, mero_host, mero_port,
- stats->dbname, "get", 1, mero_pass);
+ stats->dbname, "get", true, mero_pass);
if (e != NULL) {
fprintf(stderr, "get: %s\n", e);
free(e);
@@ -1668,7 +1668,7 @@ command_destroy(int argc, char *argv[])
for (stats = orig; stats != NULL; stats = stats->next) {
if (stats->state == SABdbRunning || stats->state ==
SABdbStarting) {
ret = control_send(&out, mero_host, mero_port,
- stats->dbname, "stop", 0,
mero_pass);
+ stats->dbname, "stop", false,
mero_pass);
if (ret != NULL)
free(ret);
else
@@ -1742,7 +1742,7 @@ snapshot_enumerate(struct snapshot **sna
{
int ninitial = *nsnapshots;
char *out = NULL;
- char *ret = control_send(&out, mero_host, mero_port, "", "snapshot
list", 1, mero_pass);
+ char *ret = control_send(&out, mero_host, mero_port, "", "snapshot
list", true, mero_pass);
if (ret != NULL)
return ret;
@@ -1908,7 +1908,7 @@ snapshot_restore_file(char *sourcefile,
}
sprintf(merocmd, "snapshot restore adhoc %s", sourcefile);
- ret = control_send(&out, mero_host, mero_port, dbname, merocmd, 0,
mero_pass);
+ ret = control_send(&out, mero_host, mero_port, dbname, merocmd, false,
mero_pass);
free(merocmd);
if (ret != NULL) {
@@ -1935,7 +1935,7 @@ snapshot_destroy_file(char *path)
char *merocmd = malloc(100 + strlen(path));
sprintf(merocmd, "snapshot destroy %s", path);
- ret = control_send(&out, mero_host, mero_port, "", merocmd, 0,
mero_pass);
+ ret = control_send(&out, mero_host, mero_port, "", merocmd, false,
mero_pass);
if (ret != NULL) {
fprintf(stderr, "snapshot destroy %s failed: %s", path, ret);
exit(2);
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
@@ -221,7 +221,7 @@ command_get(confkeyval *ckv, int argc, c
kv = findConfKey(ckv, "port");
snprintf(buf, sizeof(buf), "%s/" CONTROL_SOCK
"%d",
value, kv->ival);
- value = control_send(&res, buf, -1, "",
"mserver", 1, NULL);
+ value = control_send(&res, buf, -1, "",
"mserver", true, NULL);
if (value != NULL) {
free(value);
value = "unknown (failed to connect to
monetdbd)";
@@ -277,7 +277,7 @@ command_get(confkeyval *ckv, int argc, c
snprintf(buf, sizeof(buf), "%s/" CONTROL_SOCK
"%d",
value, kv->ival);
freeConfFile(cport);
- value = control_send(&res, buf, -1, "",
"version", 1, NULL);
+ value = control_send(&res, buf, -1, "",
"version", true, NULL);
if (value != NULL) {
free(value);
value = NULL;
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
@@ -150,7 +150,7 @@ recvWithTimeout(int msgsock, stream *fdi
}
}
-char
+bool
control_authorise(
const char *host,
const char *chal,
@@ -166,7 +166,7 @@ control_authorise(
Mfprintf(_mero_ctlout, "%s: remote control disabled\n", host);
mnstr_printf(fout, "!access denied\n");
mnstr_flush(fout, MNSTR_FLUSH_DATA);
- return 0;
+ return false;
}
pwd = mcrypt_hashPassword(algo,
@@ -175,7 +175,7 @@ control_authorise(
Mfprintf(_mero_ctlout, "%s: Allocation failure during
authentication\n", host);
mnstr_printf(fout, "!allocation failure\n");
mnstr_flush(fout, MNSTR_FLUSH_DATA);
- return 0;
+ return false;
}
if (strcmp(pwd, passwd) != 0) {
free(pwd);
@@ -183,14 +183,14 @@ control_authorise(
"(bad passphrase)\n", host);
mnstr_printf(fout, "!access denied\n");
mnstr_flush(fout, MNSTR_FLUSH_DATA);
- return 0;
+ return false;
}
free(pwd);
mnstr_printf(fout, "=OK\n");
mnstr_flush(fout, MNSTR_FLUSH_DATA);
- return 1;
+ return true;
}
#define send_client(P)
\
diff --git a/tools/merovingian/daemon/controlrunner.h
b/tools/merovingian/daemon/controlrunner.h
--- a/tools/merovingian/daemon/controlrunner.h
+++ b/tools/merovingian/daemon/controlrunner.h
@@ -11,7 +11,7 @@
#include "stream.h"
-char control_authorise(const char *host, const char *chal, const char *algo,
const char *passwd, stream *fout);
+bool control_authorise(const char *host, const char *chal, const char *algo,
const char *passwd, stream *fout);
void control_handleclient(const char *host, int sock, stream *fdin, stream
*fdout);
void *controlRunner(void *d);
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
@@ -178,7 +178,7 @@ getRemoteDB(const char *database)
pdb = &dummy;
while (rdb != NULL) {
snprintf(mfullname, sizeof(mfullname), "%s/", rdb->fullname);
- if (db_glob(mdatabase, mfullname) == 1) {
+ if (db_glob(mdatabase, mfullname)) {
/* create a fake sabdb struct, chain where necessary */
if (walk != NULL) {
walk = walk->next = malloc(sizeof(sabdb));
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
@@ -125,7 +125,7 @@ MFconnectionManager(void *d)
if (len >= 4 &&
buf[len - 3] ==
'*' && buf[len - 4] == '/')
buf[len - 2] = '\0';
- if (db_glob(buf, msg + 1) == 1)
{
+ if (db_glob(buf, msg + 1)) {
sabdb *stats;
Mapi tm = NULL;
/* match! eat away
trailing / (for matching) */
@@ -174,7 +174,7 @@ MFconnectionManager(void *d)
if (len >= 4 &&
buf[len - 3] ==
'*' && buf[len - 4] == '/')
buf[len - 2] = '\0';
- if (db_glob(buf, msg + 1) == 1)
{
+ if (db_glob(buf, msg + 1)) {
/* reevaluate, to see
if connection is still
* available */
sabdb *walk;
diff --git a/tools/merovingian/utils/control.c
b/tools/merovingian/utils/control.c
--- a/tools/merovingian/utils/control.c
+++ b/tools/merovingian/utils/control.c
@@ -478,7 +478,7 @@ char* control_send(
int port,
const char *database,
const char *command,
- char wait,
+ bool wait,
const char *pass)
{
char *msg;
@@ -639,7 +639,7 @@ char *
control_ping(const char *host, int port, const char *pass) {
char *res;
char *err;
- if ((err = control_send(&res, host, port, "", "ping", 0, pass)) ==
NULL) {
+ if ((err = control_send(&res, host, port, "", "ping", false, pass)) ==
NULL) {
if (res != NULL)
free(res);
}
diff --git a/tools/merovingian/utils/control.h
b/tools/merovingian/utils/control.h
--- a/tools/merovingian/utils/control.h
+++ b/tools/merovingian/utils/control.h
@@ -15,7 +15,7 @@ char* control_send(
int port,
const char *database,
const char *command,
- char wait,
+ bool wait,
const char *pass);
char* control_send_callback(
char** ret,
diff --git a/tools/merovingian/utils/glob.c b/tools/merovingian/utils/glob.c
--- a/tools/merovingian/utils/glob.c
+++ b/tools/merovingian/utils/glob.c
@@ -20,7 +20,7 @@
/**
* Returns if haystack matches expr, using tag globbing.
*/
-char
+bool
db_glob(const char *expr, const char *haystack)
{
const char *haymem = NULL;
@@ -48,7 +48,7 @@ db_glob(const char *expr, const char *ha
expr++;
if (*expr == '\0') {
/* this will always
match the rest */
- return(1);
+ return(true);
} else if (!escape && *expr ==
'*') {
continue;
} else if (*expr == '\\') {
@@ -65,7 +65,7 @@ db_glob(const char *expr, const char *ha
haymem = haystack + 1;
if (*haystack == '\0')
/* couldn't find it, so no
match */
- return(0);
+ return(false);
break;
}
/* do asterisk match if escaped */
@@ -75,7 +75,7 @@ db_glob(const char *expr, const char *ha
if (haymem != NULL) {
return(db_glob(exprmem,
haymem));
} else {
- return(0);
+ return(false);
}
}
break;
diff --git a/tools/merovingian/utils/glob.h b/tools/merovingian/utils/glob.h
--- a/tools/merovingian/utils/glob.h
+++ b/tools/merovingian/utils/glob.h
@@ -9,7 +9,7 @@
#ifndef _SEEN_GLOB_H
#define _SEEN_GLOB_H 1
-char db_glob(const char *expr, const char *haystack);
+bool db_glob(const char *expr, const char *haystack);
#endif
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
