Commit Diff

Commit:
c414a013eb17711ab2e1ea447aab4a3a25a09d53
From:
Christian Weisgerber <naddy@mips.inka.de>
Via:
Thomas Adam <thomas.adam@smoothwall.net>
Date:
Message:
match printf specifiers and (cast) types for portability ok stsp
Actions:
Patch | Tree
commit - 881327824d65ca303150795897d7f39b5f5370be
commit + c414a013eb17711ab2e1ea447aab4a3a25a09d53
blob - 647269f28f4fe3ad994980e8ae5ca9a14aa5ef19
blob + a06dcd6e6e5d5d4b30b9fc207ed46528af8ca290
--- gotadmin/gotadmin.c
+++ gotadmin/gotadmin.c
@@ -779,8 +779,8 @@ list_pack_cb(void *arg, struct got_object_id *id, int 
 		break;
 	case GOT_OBJ_TYPE_OFFSET_DELTA:
 		type_str = "offset-delta";
-		if (asprintf(&delta_str, " base-offset %llu",
-		    base_offset) == -1) {
+		if (asprintf(&delta_str, " base-offset %lld",
+		    (long long)base_offset) == -1) {
 			err = got_error_from_errno("asprintf");
 			goto done;
 		}
@@ -811,11 +811,12 @@ list_pack_cb(void *arg, struct got_object_id *id, int 
 		s = scaled;
 		while (isspace((unsigned char)*s))
 			s++;
-		printf("%s %s at %llu size %s%s\n", id_str, type_str, offset,
-		    s, delta_str ? delta_str : "");
+		printf("%s %s at %lld size %s%s\n", id_str, type_str,
+		    (long long)offset, s, delta_str ? delta_str : "");
 	} else {
-		printf("%s %s at %llu size %llu%s\n", id_str, type_str, offset,
-		    size, delta_str ? delta_str : "");
+		printf("%s %s at %lld size %lld%s\n", id_str, type_str,
+		    (long long)offset, (long long)size,
+		    delta_str ? delta_str : "");
 	}
 done:
 	free(id_str);