author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2008-11-04 19:22:08 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-11-06 18:18:07 (UTC) |
commit | bdd4a56ad55720cde3b7b290b6b9fe4c57dc4f01 (patch) (unidiff) | |
tree | 80622b0e4c7a969453fa281b738c7cebc0412582 /cache.c | |
parent | a918c068a695348e3f08f906b3e5845feb59d9a2 (diff) | |
download | cgit-bdd4a56ad55720cde3b7b290b6b9fe4c57dc4f01.zip cgit-bdd4a56ad55720cde3b7b290b6b9fe4c57dc4f01.tar.gz cgit-bdd4a56ad55720cde3b7b290b6b9fe4c57dc4f01.tar.bz2 |
Fix some warnings to allow -Werror
The type used to declare the st_size field of a 'struct stat' can
be a 32- or 64-bit sized type, which can vary from one platform to
another, or even from one compilation to another. In particular,
on linux, if you include the following define:
#define _FILE_OFFSET_BITS 64
prior to including certain system header files, then the type used
for the st_size field will be __off64_t, otherwise it will be an
__off_t. Note that the above define is included at the top of
git-compat-util.h.
In cache.c, the "%zd" format specifier expects a "signed size_t",
another type which can vary, when an __off64_t or a __off_t is
provided. To supress the warning, use the PRIuMAX format specifier
and cast the st_size field to uintmax_t. This should work an any
platform for which git currently compiles.
In ui-plain.c, the size parameter of sha1_object_info() and
read_sha1_file() is defined to be "unsigned long *" not "size_t *".
So, to supress the warning, simply declare size with the correct type.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -415,13 +415,13 @@ int cache_ls(const char *path) | |||
415 | cache_log("[cgit] unable to open path %s: %s (%d)\n", | 415 | cache_log("[cgit] unable to open path %s: %s (%d)\n", |
416 | fullname, strerror(err), err); | 416 | fullname, strerror(err), err); |
417 | continue; | 417 | continue; |
418 | } | 418 | } |
419 | printf("%s %s %10zd %s\n", | 419 | printf("%s %s %10"PRIuMAX" %s\n", |
420 | name, | 420 | name, |
421 | sprintftime("%Y-%m-%d %H:%M:%S", | 421 | sprintftime("%Y-%m-%d %H:%M:%S", |
422 | slot.cache_st.st_mtime), | 422 | slot.cache_st.st_mtime), |
423 | slot.cache_st.st_size, | 423 | (uintmax_t)slot.cache_st.st_size, |
424 | slot.buf); | 424 | slot.buf); |
425 | close_slot(&slot); | 425 | close_slot(&slot); |
426 | } | 426 | } |
427 | closedir(dir); | 427 | closedir(dir); |