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🔢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🔢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
This commit is contained in:
parent
3db1bfd80d
commit
b0c39ce916
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=239074
@ -1026,7 +1026,7 @@ static int
|
|||||||
cctl_error_inject(int fd, uint32_t target, uint32_t lun, int argc, char **argv,
|
cctl_error_inject(int fd, uint32_t target, uint32_t lun, int argc, char **argv,
|
||||||
char *combinedopt)
|
char *combinedopt)
|
||||||
{
|
{
|
||||||
int retval;
|
int retval = 0;
|
||||||
struct ctl_error_desc err_desc;
|
struct ctl_error_desc err_desc;
|
||||||
uint64_t lba = 0;
|
uint64_t lba = 0;
|
||||||
uint32_t len = 0;
|
uint32_t len = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user