Changeset: 2909eb0894e8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2909eb0894e8
Modified Files:
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/peering.c
Branch: default
Log Message:
merovingian: fix formatting mismatches as pointed out by Clang
diffs (111 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
@@ -50,7 +50,7 @@
{
char buf[128];
snprintf(buf, sizeof(buf),
- "LEAV %s mapi:monetdb://%s:%hu/",
+ "LEAV %s mapi:monetdb://%s:%hd/",
name, _mero_hostname,
(unsigned int)getConfNum(_mero_props, "port"));
broadcast(buf);
@@ -79,7 +79,7 @@
shared = getConfVal(props, "shared");
if (stats->locked != 1 && (shared == NULL || strcmp(shared, "no") !=
0)) {
snprintf(buf, sizeof(buf),
- "ANNC %s%s%s mapi:monetdb://%s:%hu/ %d",
+ "ANNC %s%s%s mapi:monetdb://%s:%hd/ %d",
stats->dbname,
shared == NULL ? "" : "/",
shared == NULL ? "" : shared,
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
@@ -345,7 +345,7 @@
/* craft ANNC message for this db */
if (strcmp(val, "yes") == 0)
val = "";
- snprintf(buf, 512, "ANNC %s%s%s
mapi:monetdb://%s:%hu/ %d",
+ snprintf(buf, 512, "ANNC %s%s%s
mapi:monetdb://%s:%hd/ %d",
stats->dbname, val[0]
== '\0' ? "" : "/", val,
_mero_hostname,
getConfNum(_mero_props, "port"),
discttl->ival + 60);
@@ -360,7 +360,7 @@
controlport = (unsigned int)getConfNum(_mero_props,
"controlport");
if (controlport != 0) {
/* announce control port */
- snprintf(buf, 512, "ANNC * %s:%hu %d",
+ snprintf(buf, 512, "ANNC * %s:%hd %d",
_mero_hostname, controlport,
discttl->ival + 60);
broadcast(buf);
@@ -514,7 +514,7 @@
readProps(ckv, stats->path);
kv = findConfKey(ckv, "shared");
if (kv->val != NULL && strcmp(kv->val, "no") != 0) {
- snprintf(buf, 512, "LEAV %s mapi:monetdb://%s:%hu/",
+ snprintf(buf, 512, "LEAV %s mapi:monetdb://%s:%hd/",
stats->dbname, _mero_hostname,
(unsigned int)getConfNum(_mero_props,
"port"));
broadcast(buf);
@@ -530,7 +530,7 @@
/* deregister this merovingian, so it doesn't remain a stale entry */
controlport = (unsigned int)getConfNum(_mero_props, "controlport");
if (controlport != 0) {
- snprintf(buf, 512, "LEAV * %s:%hu",
+ snprintf(buf, 512, "LEAV * %s:%hd",
_mero_hostname, controlport);
broadcast(buf);
}
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -243,7 +243,7 @@
snprintf(dbfarm, 1024, "gdk_dbfarm=%s", sabdbfarm);
snprintf(dbname, 512, "--dbname=%s", database);
snprintf(vaultkey, 512, "monet_vault_key=%s/.vaultkey",
(*stats)->path);
- snprintf(muri, 512, "merovingian_uri=mapi:monetdb://%s:%hu/%s",
+ snprintf(muri, 512, "merovingian_uri=mapi:monetdb://%s:%hd/%s",
_mero_hostname, mport, database);
argv[c++] = _mero_mserver;
argv[c++] = "--set"; argv[c++] = dbfarm;
@@ -262,7 +262,7 @@
} else {
argv[c++] = "--set"; argv[c++] =
"mapi_autosense=true";
/* for logic here, see comment below */
- snprintf(port, 24, "mapi_port=%hu", mport + 1);
+ snprintf(port, 24, "mapi_port=%hd", mport + 1);
snprintf(usock, 512, "mapi_usock=");
}
} else {
@@ -272,7 +272,7 @@
* but on another interface, (INADDR_ANY ... sigh)
causing
* endless redirects since 0.0.0.0 is not a valid
address to
* connect to, and hence the hostname is advertised
instead */
- snprintf(port, 24, "mapi_port=%hu", mport + 1);
+ snprintf(port, 24, "mapi_port=%hd", mport + 1);
snprintf(usock, 512, "mapi_usock=");
}
argv[c++] = "--set"; argv[c++] = port;
diff --git a/tools/merovingian/daemon/peering.c
b/tools/merovingian/daemon/peering.c
--- a/tools/merovingian/daemon/peering.c
+++ b/tools/merovingian/daemon/peering.c
@@ -70,7 +70,7 @@
/* tunnel mode */
masquerade = strdup(data + 7);
snprintf(data, sizeof(data),
- "tunnel %s:%hu\n", _mero_hostname,
+ "tunnel %s:%hd\n", _mero_hostname,
(unsigned int)getConfNum(_mero_props, "port"));
if (write(s, data, strlen(data)) == -1) {
close(s);
@@ -79,7 +79,7 @@
} else if (len > 0 && strcmp(data, "proxy") == 0) {
/* proxy mode */
snprintf(data, sizeof(data),
- "proxy %s:%hu\n", _mero_hostname,
+ "proxy %s:%hd\n", _mero_hostname,
(unsigned int)getConfNum(_mero_props, "port"));
if (write(s, data, strlen(data)) == -1) {
close(s);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
