upload-pack: fix sparse warnings

Commit Message

Ramsay Jones March 12, 2019, 1:53 a.m. UTC

Signed-off-by: Ramsay Jones <[e-mail]>
---

Hi Jonathan,

If you need to re-roll your 'jt/fetch-cdn-offload' branch, could
you please squash this into the relevant patches. (The first hunk
into commit a8d662e3da4 ("upload-pack: refactor reading of pack-objects
out", 2019-03-08) and the second hunk into commit 820a5361db1
("upload-pack: send part of packfile response as uri", 2019,-03-08)).

[Johannes mentioned 'clang' complaining - I have clang v5.0.1 and
it does not issue any warnings for the new initialization.]

This patch fixes the following sparse warnings:

  $ diff psp-out psp-out1
  190,191d189
  < upload-pack.c:182:45: warning: missing braces around initializer
  < upload-pack.c:1167:56: warning: Using plain integer as NULL pointer
  $ 

If you don't like the new initializer expression, maybe don't
initialize in the declaration and use a traditional:

   memset(&output_state, 0, sizeof(struct output_state));

instead?

Thanks!

ATB,
Ramsay Jones


 upload-pack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/upload-pack.c b/upload-pack.c
index d36e1fc06a..52309d40ae 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -179,7 +179,7 @@  static void create_pack_file(const struct object_array *have_obj,
 			     const struct string_list *uri_protocols)
 {
 	struct child_process pack_objects = CHILD_PROCESS_INIT;
-	struct output_state output_state = {0};
+	struct output_state output_state = { { 0 }, 0, 0, 0 };
 	char progress[128];
 	char abort_msg[] = "aborting due to possible repository "
 		"corruption on the remote side.";
@@ -1164,7 +1164,7 @@  void upload_pack(struct upload_pack_options *options)
 	if (want_obj.nr) {
 		struct object_array have_obj = OBJECT_ARRAY_INIT;
 		get_common_commits(&reader, &have_obj, &want_obj);
-		create_pack_file(&have_obj, &want_obj, 0);
+		create_pack_file(&have_obj, &want_obj, NULL);
 	}
 }