[Patch] btrfs-image.c: fix return values

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



- Exit with non-zero when fail;
- Don't exit in non-main functions, return.

Signed-off-by: WANG Cong <wangcong@xxxxxxxxx>

---
diff --git a/btrfs-image.c b/btrfs-image.c
index 9925bdb..62b3dd8 100644
--- a/btrfs-image.c
+++ b/btrfs-image.c
@@ -741,7 +741,7 @@ static int restore_metadump(const char *input, FILE *out, int num_threads)
 		in = fopen(input, "r");
 		if (!in) {
 			perror("unable to open metadump image");
-			exit(1);
+			return 1;
 		}
 	}
 
@@ -760,7 +760,7 @@ static int restore_metadump(const char *input, FILE *out, int num_threads)
 		if (le64_to_cpu(header->magic) != HEADER_MAGIC ||
 		    le64_to_cpu(header->bytenr) != bytenr) {
 			fprintf(stderr, "bad header in metadump image\n");
-			exit(1);
+			return 1;
 		}
 		ret = add_cluster(cluster, &mdrestore, &bytenr);
 		BUG_ON(ret);
@@ -850,5 +850,5 @@ int main(int argc, char *argv[])
 	else
 		fclose(out);
 
-	exit(0);
+	exit(ret);
 }


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux