aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-04-12 16:20:52 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-04-12 16:20:52 +0000
commit1776f8bf1ecc2daec2573fb45a7dcbbbf7519cd8 (patch)
tree2d6a1c1934f87365ab5949778935223d72569d0f
parentci: move sr.ht's .build.yml to .builds/alpine.yml (diff)
Fix clang warnings
All are printf() formatter related. Even if a variable is e.g. a 'short', when used in an expression like '<variable> - 1' it is promoted to an 'int'. Closes #16
-rw-r--r--csi.c2
-rw-r--r--server.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/csi.c b/csi.c
index 189188c6..335ac037 100644
--- a/csi.c
+++ b/csi.c
@@ -58,7 +58,7 @@ csi_as_string(struct terminal *term, uint8_t final, int idx)
i == term->vt.params.idx - 1 ? "" : ";");
}
- snprintf(&msg[c], sizeof(msg) - c, "%c (%hhu parameters)",
+ snprintf(&msg[c], sizeof(msg) - c, "%c (%u parameters)",
final, idx >= 0 ? 1 : term->vt.params.idx);
return msg;
}
diff --git a/server.c b/server.c
index 99c0e7ad..33817b11 100644
--- a/server.c
+++ b/server.c
@@ -208,7 +208,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
LOG_DBG("CWD = %.*s", cwd_len, cwd);
if (cwd_len != strlen(cwd) + 1) {
- LOG_ERR("CWD length mismatch: indicated = %hu, actual = %zu",
+ LOG_ERR("CWD length mismatch: indicated = %u, actual = %zu",
cwd_len - 1, strlen(cwd));
goto shutdown;
}
@@ -221,7 +221,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
LOG_DBG("TERM = %.*s", term_env_len, term_env);
if (term_env_len != strlen(term_env) + 1) {
- LOG_ERR("TERM length mismatch: indicated = %hu, actual = %zu",
+ LOG_ERR("TERM length mismatch: indicated = %u, actual = %zu",
term_env_len - 1, strlen(term_env));
goto shutdown;
}
@@ -234,7 +234,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
LOG_DBG("app-id = %.*s", title_len, title);
if (title_len != strlen(title) + 1) {
- LOG_ERR("title length mismatch: indicated = %hu, actual = %zu",
+ LOG_ERR("title length mismatch: indicated = %u, actual = %zu",
title_len - 1, strlen(title));
goto shutdown;
}
@@ -247,7 +247,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
LOG_DBG("app-id = %.*s", app_id_len, app_id);
if (app_id_len != strlen(app_id) + 1) {
- LOG_ERR("app-id length mismatch: indicated = %hu, actual = %zu",
+ LOG_ERR("app-id length mismatch: indicated = %u, actual = %zu",
app_id_len - 1, strlen(app_id));
goto shutdown;
}
@@ -275,7 +275,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
LOG_DBG("argv[%d] = %s", i, argv[i]);
if (len != strlen(argv[i]) + 1) {
- LOG_ERR("argv[%d] length mismatch: indicated = %hu, actual = %zu",
+ LOG_ERR("argv[%d] length mismatch: indicated = %u, actual = %zu",
i, len - 1, strlen(argv[i]));
goto shutdown;
}