cat-file: stop returning value from batch_one_object

peff · gitster · commit 82330950d96a · 2015-06-22T14:55:52.000-07:00
If batch_one_object returns an error code, we stop reading input. However, it will only do so if we feed it NULL, which cannot happen; we give it the "buf" member of a strbuf, which is always non-NULL. We did originally stop on other errors (like a missing object), but this was changed in 3c076db (cat-file --batch / --batch-check: do not exit if hashes are missing, 2008-06-09). These days we keep going for any per-object error (and print "missing" when necessary). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
@@ -251,17 +251,14 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
 	}
 }
 
-static int batch_one_object(const char *obj_name, struct batch_options *opt,
-			    struct expand_data *data)
+static void batch_one_object(const char *obj_name, struct batch_options *opt,
+			     struct expand_data *data)
 {
 	struct strbuf buf = STRBUF_INIT;
 	struct object_context ctx;
 	int flags = opt->follow_symlinks ? GET_SHA1_FOLLOW_SYMLINKS : 0;
 	enum follow_symlinks_result result;
 
-	if (!obj_name)
-	   return 1;
-
 	result = get_sha1_with_context(obj_name, flags, data->sha1, &ctx);
 	if (result != FOUND) {
 		switch (result) {
@@ -286,21 +283,21 @@ static int batch_one_object(const char *obj_name, struct batch_options *opt,
 			break;
 		}
 		fflush(stdout);
-		return 0;
+		return;
 	}
 
 	if (ctx.mode == 0) {
 		printf("symlink %"PRIuMAX"\n%s\n",
 		       (uintmax_t)ctx.symlink_path.len,
 		       ctx.symlink_path.buf);
 		fflush(stdout);
-		return 0;
+		return;
 	}
 
 	if (sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {
 		printf("%s missing\n", obj_name);
 		fflush(stdout);
-		return 0;
+		return;
 	}
 
 	strbuf_expand(&buf, opt->format, expand_format, data);
@@ -312,7 +309,6 @@ static int batch_one_object(const char *obj_name, struct batch_options *opt,
 		print_object_or_die(opt, data);
 		batch_write(opt, "\n", 1);
 	}
-	return 0;
 }
 
 static int batch_objects(struct batch_options *opt)
@@ -367,9 +363,7 @@ static int batch_objects(struct batch_options *opt)
 			data.rest = p;
 		}
 
-		retval = batch_one_object(buf.buf, opt, &data);
-		if (retval)
-			break;
+		batch_one_object(buf.buf, opt, &data);
 	}
 
 	strbuf_release(&buf);

Original file line number	Diff line number	Diff line change
`@@ -251,17 +251,14 @@ static void print_object_or_die(struct batch_options opt, struct expand_data d`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
`254`		`-static int batch_one_object(const char obj_name, struct batch_options opt,`
`255`		`- struct expand_data *data)`
	`254`	`+static void batch_one_object(const char obj_name, struct batch_options opt,`
	`255`	`+ struct expand_data *data)`
`256`	`256`	`{`
`257`	`257`	`struct strbuf buf = STRBUF_INIT;`
`258`	`258`	`struct object_context ctx;`
`259`	`259`	`int flags = opt->follow_symlinks ? GET_SHA1_FOLLOW_SYMLINKS : 0;`
`260`	`260`	`enum follow_symlinks_result result;`
`261`	`261`
`262`		`- if (!obj_name)`
`263`		`- return 1;`
`264`		`-`
`265`	`262`	`result = get_sha1_with_context(obj_name, flags, data->sha1, &ctx);`
`266`	`263`	`if (result != FOUND) {`
`267`	`264`	`switch (result) {`
`@@ -286,21 +283,21 @@ static int batch_one_object(const char obj_name, struct batch_options opt,`
`286`	`283`	`break;`
`287`	`284`	`}`
`288`	`285`	`fflush(stdout);`
`289`		`- return 0;`
	`286`	`+ return;`
`290`	`287`	`}`
`291`	`288`
`292`	`289`	`if (ctx.mode == 0) {`
`293`	`290`	`printf("symlink %"PRIuMAX"\n%s\n",`
`294`	`291`	`(uintmax_t)ctx.symlink_path.len,`
`295`	`292`	`ctx.symlink_path.buf);`
`296`	`293`	`fflush(stdout);`
`297`		`- return 0;`
	`294`	`+ return;`
`298`	`295`	`}`
`299`	`296`
`300`	`297`	`if (sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {`
`301`	`298`	`printf("%s missing\n", obj_name);`
`302`	`299`	`fflush(stdout);`
`303`		`- return 0;`
	`300`	`+ return;`
`304`	`301`	`}`
`305`	`302`
`306`	`303`	`strbuf_expand(&buf, opt->format, expand_format, data);`
`@@ -312,7 +309,6 @@ static int batch_one_object(const char obj_name, struct batch_options opt,`
`312`	`309`	`print_object_or_die(opt, data);`
`313`	`310`	`batch_write(opt, "\n", 1);`
`314`	`311`	`}`
`315`		`- return 0;`
`316`	`312`	`}`
`317`	`313`
`318`	`314`	`static int batch_objects(struct batch_options *opt)`
`@@ -367,9 +363,7 @@ static int batch_objects(struct batch_options *opt)`
`367`	`363`	`data.rest = p;`
`368`	`364`	`}`
`369`	`365`
`370`		`- retval = batch_one_object(buf.buf, opt, &data);`
`371`		`- if (retval)`
`372`		`- break;`
	`366`	`+ batch_one_object(buf.buf, opt, &data);`
`373`	`367`	`}`
`374`	`368`
`375`	`369`	`strbuf_release(&buf);`