X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=convert-objects.c;h=90e7900e6d7aff2fadf9ba04f8d982733493411c;hb=444649e5a833c6ed24e0e92364923324d9ffb386;hp=b5f41ae2e38c1f7856d7f060955eed5da0aea036;hpb=99e6ac503b175ef38ca98e88a6ec1e290ad79d69;p=git.git

diff --git a/convert-objects.c b/convert-objects.c
index b5f41ae2e..90e7900e6 100644
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -88,7 +88,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
 		unsigned int mode;
 		char *slash, *origpath;
 
-		if (!path || sscanf(buffer, "%o", &mode) != 1)
+		if (!path || strtoul_ui(buffer, 8, &mode))
 			die("bad tree conversion");
 		mode = convert_mode(mode);
 		path++;
@@ -132,7 +132,7 @@ static void convert_tree(void *buffer, unsigned long size, unsigned char *result
 	unsigned long orig_size = size;
 
 	while (size) {
-		int len = 1+strlen(buffer);
+		size_t len = 1+strlen(buffer);
 
 		convert_binary_sha1((char *) buffer + len);
 
@@ -194,7 +194,7 @@ static unsigned long parse_oldstyle_date(const char *buf)
 		fmt++;
 	} while (*buf && *fmt);
 	printf("left: %s\n", buf);
-	return mktime(&tm);				
+	return mktime(&tm);
 }
 
 static int convert_date_line(char *dst, void **buf, unsigned long *sp)