X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cat-file.c;h=3c47d79a16305d326a65768fe9f37ee25928510b;hb=e1a1388d858fa8522f187d3fdea92ff84e21528c;hp=3071672c6ce2ffb7c1c7d43c1a728f8e020e296b;hpb=bf0c6e839c692142784caf07b523cd69442e57a5;p=git.git

diff --git a/cat-file.c b/cat-file.c
index 3071672c..3c47d79a 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -11,23 +11,19 @@ int main(int argc, char **argv)
 	char type[20];
 	void *buf;
 	unsigned long size;
-	int fd;
 
 	if (argc != 3 || get_sha1_hex(argv[2], sha1))
-		usage("cat-file: cat-file [-t | tagname] <sha1>");
+		usage("cat-file [-t | tagname] <sha1>");
 	buf = read_sha1_file(sha1, type, &size);
-	if (!buf) {
-		fprintf(stderr, "cat-file %s: bad file\n", argv[2]);
-		exit(1);
-	}
+	if (!buf)
+		die("cat-file %s: bad file", argv[2]);
 	if (!strcmp("-t", argv[1])) {
 		buf = type;
 		size = strlen(type);
 		type[size] = '\n';
 		size++;
 	} else if (strcmp(type, argv[1])) {
-		fprintf(stderr, "cat-file %s: bad tag\n", argv[2]);
-		exit(1);	/* bad tag */
+		die("cat-file %s: bad tag", argv[2]);
 	}
 
 	while (size > 0) {
@@ -38,12 +34,9 @@ int main(int argc, char **argv)
 			/* Ignore epipe */
 			if (errno == EPIPE)
 				break;
-			fprintf(stderr, "cat-file: %s\n", strerror(errno));
-			exit(1);
-		}
-		if (!ret) {
-			fprintf(stderr, "cat-file: disk full?");
-			exit(1);
+			die("cat-file: %s", strerror(errno));
+		} else if (!ret) {
+			die("cat-file: disk full?");
 		}
 		size -= ret;
 		buf += ret;