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>
Cette révision appartient à :
Parent
a918c068a6
révision
bdd4a56ad5
4
cache.c
4
cache.c
@ -416,11 +416,11 @@ int cache_ls(const char *path)
|
||||
fullname, strerror(err), err);
|
||||
continue;
|
||||
}
|
||||
printf("%s %s %10zd %s\n",
|
||||
printf("%s %s %10"PRIuMAX" %s\n",
|
||||
name,
|
||||
sprintftime("%Y-%m-%d %H:%M:%S",
|
||||
slot.cache_st.st_mtime),
|
||||
slot.cache_st.st_size,
|
||||
(uintmax_t)slot.cache_st.st_size,
|
||||
slot.buf);
|
||||
close_slot(&slot);
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ static void print_object(const unsigned char *sha1, const char *path)
|
||||
{
|
||||
enum object_type type;
|
||||
char *buf;
|
||||
size_t size;
|
||||
unsigned long size;
|
||||
|
||||
type = sha1_object_info(sha1, &size);
|
||||
if (type == OBJ_BAD) {
|
||||
|
Chargement…
Référencer dans un nouveau ticket
Block a user