odb: use git_object_size_t for object size

ethomson · ethomson · commit fefefd1d3942 · 2019-11-22T15:14:13.000+11:00
Instead of using a signed type (`off_t`) use a new `git_object_size_t`
for the sizes of objects.
diff --git a/include/git2/sys/odb_backend.h b/include/git2/sys/odb_backend.h
@@ -53,7 +53,7 @@ struct git_odb_backend {
 		git_odb_backend *, const git_oid *, const void *, size_t, git_object_t);
 
 	int GIT_CALLBACK(writestream)(
-		git_odb_stream **, git_odb_backend *, git_off_t, git_object_t);
+		git_odb_stream **, git_odb_backend *, git_object_size_t, git_object_t);
 
 	int GIT_CALLBACK(readstream)(
 		git_odb_stream **, size_t *, git_object_t *,
diff --git a/src/odb_loose.c b/src/odb_loose.c
@@ -824,7 +824,7 @@ static int filebuf_flags(loose_backend *backend)
 	return flags;
 }
 
-static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backend *_backend, git_off_t length, git_object_t type)
+static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backend *_backend, git_object_size_t length, git_object_t type)
 {
 	loose_backend *backend;
 	loose_writestream *stream = NULL;
@@ -833,7 +833,7 @@ static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backe
 	size_t hdrlen;
 	int error;
 
-	assert(_backend && length >= 0);
+	assert(_backend);
 
 	backend = (loose_backend *)_backend;
 	*stream_out = NULL;
diff --git a/src/patch_parse.c b/src/patch_parse.c
@@ -491,7 +491,7 @@ static int parse_header_git(
 
 static int parse_int(int *out, git_patch_parse_ctx *ctx)
 {
-	git_off_t num;
+	int64_t num;
 
 	if (git_parse_advance_digit(&num, &ctx->parse_ctx, 10) < 0 || !git__is_int(num))
 		return -1;
@@ -765,7 +765,7 @@ static int parse_patch_binary_side(
 {
 	git_diff_binary_t type = GIT_DIFF_BINARY_NONE;
 	git_buf base85 = GIT_BUF_INIT, decoded = GIT_BUF_INIT;
-	git_off_t len;
+	int64_t len;
 	int error = 0;
 
 	if (git_parse_ctx_contains_s(&ctx->parse_ctx, "literal ")) {

Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,7 @@ static int filebuf_flags(loose_backend *backend)`
`824`	`824`	`return flags;`
`825`	`825`	`}`
`826`	`826`
`827`		`-static int loose_backend__writestream(git_odb_stream *stream_out, git_odb_backend _backend, git_off_t length, git_object_t type)`
	`827`	`+static int loose_backend__writestream(git_odb_stream *stream_out, git_odb_backend _backend, git_object_size_t length, git_object_t type)`
`828`	`828`	`{`
`829`	`829`	`loose_backend *backend;`
`830`	`830`	`loose_writestream *stream = NULL;`
`@@ -833,7 +833,7 @@ static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backe`
`833`	`833`	`size_t hdrlen;`
`834`	`834`	`int error;`
`835`	`835`
`836`		`- assert(_backend && length >= 0);`
	`836`	`+ assert(_backend);`
`837`	`837`
`838`	`838`	`backend = (loose_backend *)_backend;`
`839`	`839`	`*stream_out = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ static int parse_header_git(`
`491`	`491`
`492`	`492`	`static int parse_int(int out, git_patch_parse_ctx ctx)`
`493`	`493`	`{`
`494`		`- git_off_t num;`
	`494`	`+ int64_t num;`
`495`	`495`
`496`	`496`	`if (git_parse_advance_digit(&num, &ctx->parse_ctx, 10) < 0 \|\| !git__is_int(num))`
`497`	`497`	`return -1;`
`@@ -765,7 +765,7 @@ static int parse_patch_binary_side(`
`765`	`765`	`{`
`766`	`766`	`git_diff_binary_t type = GIT_DIFF_BINARY_NONE;`
`767`	`767`	`git_buf base85 = GIT_BUF_INIT, decoded = GIT_BUF_INIT;`
`768`		`- git_off_t len;`
	`768`	`+ int64_t len;`
`769`	`769`	`int error = 0;`
`770`	`770`
`771`	`771`	`if (git_parse_ctx_contains_s(&ctx->parse_ctx, "literal ")) {`