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>

2 files changed, 3 insertions, 3 deletions

diff --git a/cache.c b/cache.c
index 57068a1..d7a8d5a 100644
--- a/cache.c
+++ b/cache.c
@@ -323,117 +323,117 @@ int cache_process(int size, const char *path, const char *key, int ttl,
 		return 0;
 	}
 
 	/* Verify input, calculate filenames */
 	if (!path) {
 		cache_log("[cgit] Cache path not specified, caching is disabled\n");
 		fn(cbdata);
 		return 0;
 	}
 	len = strlen(path);
 	if (len > sizeof(filename) - 10) { /* 10 = "/01234567\0" */
 		cache_log("[cgit] Cache path too long, caching is disabled: %s\n",
 			  path);
 		fn(cbdata);
 		return 0;
 	}
 	if (!key)
 		key = "";
 	hash = hash_str(key) % size;
 	strcpy(filename, path);
 	if (filename[len - 1] != '/')
 		filename[len++] = '/';
 	for(i = 0; i < 8; i++) {
 		sprintf(filename + len++, "%x",
 			(unsigned char)(hash & 0xf));
 		hash >>= 4;
 	}
 	filename[len] = '\0';
 	strcpy(lockname, filename);
 	strcpy(lockname + len, ".lock");
 	slot.fn = fn;
 	slot.cbdata = cbdata;
 	slot.ttl = ttl;
 	slot.cache_name = filename;
 	slot.lock_name = lockname;
 	slot.key = key;
 	slot.keylen = strlen(key);
 	return process_slot(&slot);
 }
 
 /* Return a strftime formatted date/time
  * NB: the result from this function is to shared memory
  */
 char *sprintftime(const char *format, time_t time)
 {
 	static char buf[64];
 	struct tm *tm;
 
 	if (!time)
 		return NULL;
 	tm = gmtime(&time);
 	strftime(buf, sizeof(buf)-1, format, tm);
 	return buf;
 }
 
 int cache_ls(const char *path)
 {
 	DIR *dir;
 	struct dirent *ent;
 	int err = 0;
 	struct cache_slot slot;
 	char fullname[1024];
 	char *name;
 
 	if (!path) {
 		cache_log("[cgit] cache path not specified\n");
 		return -1;
 	}
 	if (strlen(path) > 1024 - 10) {
 		cache_log("[cgit] cache path too long: %s\n",
 			  path);
 		return -1;
 	}
 	dir = opendir(path);
 	if (!dir) {
 		err = errno;
 		cache_log("[cgit] unable to open path %s: %s (%d)\n",
 			  path, strerror(err), err);
 		return err;
 	}
 	strcpy(fullname, path);
 	name = fullname + strlen(path);
 	if (*(name - 1) != '/') {
 		*name++ = '/';
 		*name = '\0';
 	}
 	slot.cache_name = fullname;
 	while((ent = readdir(dir)) != NULL) {
 		if (strlen(ent->d_name) != 8)
 			continue;
 		strcpy(name, ent->d_name);
 		if ((err = open_slot(&slot)) != 0) {
 			cache_log("[cgit] unable to open path %s: %s (%d)\n",
 				  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);
 	}
 	closedir(dir);
 	return 0;
 }
 
 /* Print a message to stdout */
 void cache_log(const char *format, ...)
 {
 	va_list args;
 	va_start(args, format);
 	vfprintf(stderr, format, args);
 	va_end(args);
 }
 
diff --git a/ui-plain.c b/ui-plain.c
index be559e0..5addd9e 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,79 +1,79 @@
 /* ui-plain.c: functions for output of plain blobs by path
  *
  * Copyright (C) 2008 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
 int match;
 
 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) {
 		html_status(404, "Not found", 0);
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
 		html_status(404, "Not found", 0);
 		return;
 	}
 	ctx.page.mimetype = "text/plain";
 	ctx.page.filename = fmt("%s", path);
 	ctx.page.size = size;
 	cgit_print_http_headers(&ctx);
 	html_raw(buf, size);
 	match = 1;
 }
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 		     const char *pathname, unsigned mode, int stage,
 		     void *cbdata)
 {
 	if (S_ISDIR(mode))
 		return READ_TREE_RECURSIVE;
 
 	if (S_ISREG(mode))
 		print_object(sha1, pathname);
 
 	return 0;
 }
 
 void cgit_print_plain(struct cgit_context *ctx)
 {
 	const char *rev = ctx->qry.sha1;
 	unsigned char sha1[20];
 	struct commit *commit;
 	const char *paths[] = {ctx->qry.path, NULL};
 
 	if (!rev)
 		rev = ctx->qry.head;
 
 	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
 		html_status(404, "Not found", 0);
 		return;
 	}
 	commit = lookup_commit_reference(sha1);
 	if (!commit || parse_commit(commit)) {
 		html_status(404, "Not found", 0);
 		return;
 	}
 	match_path = ctx->qry.path;
 	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
 	if (!match)
 		html_status(404, "Not found", 0);
 }