commit 01bb5a15144ece7ca707994fb56e1847c76a1a92
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas.adam@smoothwall.net>
date: Sat Sep 25 22:38:40 2021 UTC

fix some integers that had a slightly wrong type; patch by Omar Polo

commit - 8f1c06eb7569f957aec944ee5130e28e0cf7c2bd
commit + 01bb5a15144ece7ca707994fb56e1847c76a1a92
blob - 0b62c26c8990e23ab00c91090588f0e298ef258e
blob + 005914093bf904b0e5687ccc411f6f975c1e2219
--- libexec/got-fetch-pack/got-fetch-pack.c
+++ libexec/got-fetch-pack/got-fetch-pack.c
@@ -778,7 +778,7 @@ int
 main(int argc, char **argv)
 {
 	const struct got_error *err = NULL;
-	int fetchfd, packfd = -1, i;
+	int fetchfd, packfd = -1;
 	uint8_t pack_sha1[SHA1_DIGEST_LENGTH];
 	struct imsgbuf ibuf;
 	struct imsg imsg;
@@ -790,7 +790,7 @@ main(int argc, char **argv)
 	struct got_imsg_fetch_have_ref href;
 	struct got_imsg_fetch_wanted_branch wbranch;
 	struct got_imsg_fetch_wanted_ref wref;
-	size_t datalen;
+	size_t datalen, i;
 #if 0
 	static int attached;
 	while (!attached)
blob - 941487e40d25af2df9387e12a870e7c082e905c9
blob + 70a0245af23f51f482857d2560c04e849fdbfc26
--- libexec/got-read-pack/got-read-pack.c
+++ libexec/got-read-pack/got-read-pack.c
@@ -251,7 +251,7 @@ tree_request(struct imsg *imsg, struct imsgbuf *ibuf, 
 }
 
 static const struct got_error *
-receive_file(FILE **f, struct imsgbuf *ibuf, int imsg_code)
+receive_file(FILE **f, struct imsgbuf *ibuf, uint32_t imsg_code)
 {
 	const struct got_error *err;
 	struct imsg imsg;
@@ -539,7 +539,7 @@ send_traversed_commits(struct got_object_id *commit_id
 {
 	const struct got_error *err;
 	struct ibuf *wbuf;
-	int i;
+	size_t i;
 
 	wbuf = imsg_create(ibuf, GOT_IMSG_TRAVERSED_COMMITS, 0, 0,
 	    sizeof(struct got_imsg_traversed_commits) +
blob - 91674461564887f691b79dc590d4f9199284f2df
blob + c5fac4aca09fb9fb30266856ac9bdf28c6708768
--- libexec/got-send-pack/got-send-pack.c
+++ libexec/got-send-pack/got-send-pack.c
@@ -572,7 +572,7 @@ int
 main(int argc, char **argv)
 {
 	const struct got_error *err = NULL;
-	int sendfd, i;
+	int sendfd;
 	struct imsgbuf ibuf;
 	struct imsg imsg;
 	struct got_pathlist_head refs;
@@ -580,7 +580,7 @@ main(int argc, char **argv)
 	struct got_pathlist_entry *pe;
 	struct got_imsg_send_request send_req;
 	struct got_imsg_send_ref href;
-	size_t datalen;
+	size_t datalen, i;
 #if 0
 	static int attached;
 	while (!attached)