From 71bba424adcfa8c44100dee0fd139cc057eace65 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 8 Oct 2012 07:45:54 +0000 Subject: [PATCH] disk: get_device_and_partition() return value fixes When no valid partitions are found, guarantee that we return -1. This most likely already happens, since the most recent get_partition_info() will have returned an error. However, it's best to be explicit. Remove an unnecessary assignment of ret=0 in the success case; this value is over-written with the processed partition ID later. Signed-off-by: Stephen Warren --- disk/part.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/part.c b/disk/part.c index 30229692fb..a0c77ddc9d 100644 --- a/disk/part.c +++ b/disk/part.c @@ -624,9 +624,9 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str, */ if (p == MAX_SEARCH_PARTITIONS + 1) *info = tmpinfo; - ret = 0; } else { printf("** No valid partitions found **\n"); + ret = -1; goto cleanup; } } -- 2.39.2