aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-08-06 21:20:46 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-08-06 21:20:46 +0000
commit019b6bc039f318b150b78a1fec3672db71c74a63 (patch)
tree96cd5fc77465d27ac4087f0e1c31bd34415d32bc
parentMerge branch 'xmalloc' into master (diff)
fix printf-format errors in 32-bit builds
-rw-r--r--CHANGELOG.md1
-rw-r--r--config.c4
-rw-r--r--csi.c2
-rw-r--r--search.c2
4 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12566d45..62aa0906 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
instead of every time the key binding is executed.
* Incorrect multi-column character spacer insertion when reflowing
text.
+* Compilation errors in 32-bit builds.
### Security
diff --git a/config.c b/config.c
index 142a0995..74d47db8 100644
--- a/config.c
+++ b/config.c
@@ -1012,8 +1012,8 @@ parse_section_tweak(
}
conf->tweak.max_shm_pool_size = min(mb * 1024 * 1024, INT32_MAX);
- LOG_WARN("tweak: max-shm-pool-size=%lu bytes",
- conf->tweak.max_shm_pool_size);
+ LOG_WARN("tweak: max-shm-pool-size=%lld bytes",
+ (long long)conf->tweak.max_shm_pool_size);
}
else {
diff --git a/csi.c b/csi.c
index 9e230b63..a0a3eba4 100644
--- a/csi.c
+++ b/csi.c
@@ -336,7 +336,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
* _not_ preceeded by a graphical character.
*/
int count = vt_param_get(term, 0, 1);
- LOG_DBG("REP: '%C' %d times", term->vt.last_printed, count);
+ LOG_DBG("REP: '%lc' %d times", (wint_t)term->vt.last_printed, count);
const int width = wcwidth(term->vt.last_printed);
if (width > 0) {
diff --git a/search.c b/search.c
index a0b87a13..4d12ddf8 100644
--- a/search.c
+++ b/search.c
@@ -656,7 +656,7 @@ search_input(struct seat *seat, struct terminal *term, uint32_t key,
term->search.buf[term->search.len] = L'\0';
update_search:
- LOG_DBG("search: buffer: %S", term->search.buf);
+ LOG_DBG("search: buffer: %ls", term->search.buf);
search_find_next(term);
render_refresh_search(term);
}