From b0c39ce9166480c68292876504eadb9a1628da15 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 5 Aug 2012 17:23:47 +0000 Subject: [PATCH] In usr.sbin/ctladm/ctladm.c, function cctl_error_inject(), initialize the 'retval' variable to zero, to avoid returning garbage in several cases. This fixes the following clang 3.2 warnings: usr.sbin/ctladm/ctladm.c:1234:6: error: variable 'retval' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (ioctl(fd, CTL_ERROR_INJECT, &err_desc) == -1) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ usr.sbin/ctladm/ctladm.c:1243:10: note: uninitialized use occurs here return (retval); ^~~~~~ usr.sbin/ctladm/ctladm.c:1234:2: note: remove the 'if' if its condition is always true if (ioctl(fd, CTL_ERROR_INJECT, &err_desc) == -1) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ usr.sbin/ctladm/ctladm.c:1161:7: error: variable 'retval' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (ioctl(fd, CTL_ERROR_INJECT_DELETE, &err_desc) == -1) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ usr.sbin/ctladm/ctladm.c:1243:10: note: uninitialized use occurs here return (retval); ^~~~~~ usr.sbin/ctladm/ctladm.c:1161:3: note: remove the 'if' if its condition is always true if (ioctl(fd, CTL_ERROR_INJECT_DELETE, &err_desc) == -1) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ usr.sbin/ctladm/ctladm.c:1029:12: note: initialize the variable 'retval' to silence this warning int retval; ^ = 0 MFC after: 1 week --- usr.sbin/ctladm/ctladm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 4cdbd42ce4f5..9497101d0375 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -1026,7 +1026,7 @@ static int cctl_error_inject(int fd, uint32_t target, uint32_t lun, int argc, char **argv, char *combinedopt) { - int retval; + int retval = 0; struct ctl_error_desc err_desc; uint64_t lba = 0; uint32_t len = 0;