Fix compilation warnings on all Debian architectures. (#3007)

stbuf.st_size is of type off_t, which the standard defines as “extended signed
integral type”¹, and for which there is no correct printf format string. Hence,
we need to cast it into a hopefully-large-enough type (ugh) and use the
corresponding format string. In our case, int64_t should do it, as config files
really shouldn’t be anywhere close to those numbers.

① http://pubs.opengroup.org/onlinepubs/007908799/xsh/systypes.h.html
This commit is contained in:
Michael Stapelberg 2017-09-30 10:16:21 -07:00 committed by GitHub
parent 962750eb64
commit 21cdcdb07c
3 changed files with 5 additions and 2 deletions

View File

@ -28,6 +28,7 @@
#include <errno.h> #include <errno.h>
#include <err.h> #include <err.h>
#include <stdint.h> #include <stdint.h>
#include <inttypes.h>
#include <math.h> #include <math.h>
#include <limits.h> #include <limits.h>

View File

@ -902,7 +902,9 @@ bool parse_file(const char *f, bool use_nagbar) {
FREE(current_config); FREE(current_config);
current_config = scalloc(stbuf.st_size + 1, 1); current_config = scalloc(stbuf.st_size + 1, 1);
fread(current_config, 1, stbuf.st_size, fstr); if ((ssize_t)fread(current_config, 1, stbuf.st_size, fstr) != stbuf.st_size) {
die("Could not fread: %s\n", strerror(errno));
}
rewind(fstr); rewind(fstr);
bool invalid_sets = false; bool invalid_sets = false;

View File

@ -500,7 +500,7 @@ ssize_t slurp(const char *path, char **buf) {
size_t n = fread(*buf, 1, stbuf.st_size, f); size_t n = fread(*buf, 1, stbuf.st_size, f);
fclose(f); fclose(f);
if ((ssize_t)n != stbuf.st_size) { if ((ssize_t)n != stbuf.st_size) {
ELOG("File \"%s\" could not be read entirely: got %zd, want %zd\n", path, n, stbuf.st_size); ELOG("File \"%s\" could not be read entirely: got %zd, want %" PRIi64 "\n", path, n, (int64_t)stbuf.st_size);
free(*buf); free(*buf);
*buf = NULL; *buf = NULL;
return -1; return -1;