Changeset: 0c71bb4c8399 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0c71bb4c8399
Modified Files:
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/utils/control.c
tools/merovingian/utils/control.h
Branch: default
Log Message:
Use bool.
diffs (156 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
@@ -248,7 +248,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);
@@ -593,7 +593,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)
@@ -954,7 +954,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);
@@ -1245,7 +1245,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);
@@ -1263,7 +1263,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);
@@ -1364,7 +1364,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);
@@ -1392,7 +1392,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);
@@ -1667,7 +1667,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
@@ -1741,7 +1741,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;
@@ -1907,7 +1907,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) {
@@ -1934,7 +1934,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/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,
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
