diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-08-25 18:49:29 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-08-25 18:49:29 +0000 |
| commit | 139f59c27d2f7f2fddef862408407f30107749b0 (patch) | |
| tree | ff35ea47189229023254eca733b1a93d385e0953 | |
| parent | Merge branch 'pedantic' into master (diff) | |
| parent | fix some buggy comparisons relating to signed/unsigned types (diff) | |
Merge branch 'type-limit-fixes' into master
| -rw-r--r-- | config.c | 2 | ||||
| -rw-r--r-- | shm.c | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -427,7 +427,7 @@ parse_section_scrollback(const char *key, const char *value, struct config *conf conf->scrollback.indicator.text = NULL; size_t len = mbstowcs(NULL, value, 0); - if (len < 0) { + if (len == (size_t)-1) { LOG_AND_NOTIFY_ERRNO( "%s:%d: [scrollback]: indicator-format: " "invalid value: %s", path, lineno, value); @@ -131,10 +131,12 @@ page_size(void) { static size_t size = 0; if (size == 0) { - size = sysconf(_SC_PAGE_SIZE); - if (size < 0) { + long n = sysconf(_SC_PAGE_SIZE); + if (n <= 0) { LOG_ERRNO("failed to get page size"); size = 4096; + } else { + size = (size_t)n; } } assert(size > 0); |
