From: Matthew Daley <mattjd@gmail.com>
Date: Wed, 30 Oct 2013 07:52:05 +0000 (+1300)
Subject: xentrace: undeadify invalid option argument handling
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6089
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=96be5eab5d58e209f24c02dd1cdc54e56d7e0803;p=xen.git

xentrace: undeadify invalid option argument handling

Apparently it's always been like this.

Coverity-ID: 1056153
Signed-off-by: Matthew Daley <mattjd@gmail.com>
Reviewed-by: George Dunlap <george.dunlap@eu.citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
index 504763d09f..8a38e3268a 100644
--- a/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@ -858,10 +858,11 @@ long sargtol(const char *restrict arg, int base)
 
 
     return val;
+
 invalid:
-    return 0;
     fprintf(stderr, "Invalid option argument: %s\n\n", arg);
     usage();
+    return 0; /* not actually reached */
 }
 
 /* convert the argument string pointed to by arg to a long int representation */