d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In nvmecontrol, fix gcc warnings about the local 'power' variables

Browse Source 
shadowing a global declaration.
This commit is contained in:
Dimitry Andric 2016-03-11 17:25:18 +00:00
parent 7b526e77f2
commit b130d07f90
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=296672
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/nvmecontrol/power.c
View File

@ -87,7 +87,7 @@ power_list(struct nvme_controller_data *cdata)
} }
static void static void
power_set(int fd, int power, int workload, int perm) power_set(int fd, int power_val, int workload, int perm)
{ {
struct nvme_pt_command pt; struct nvme_pt_command pt;
uint32_t p; uint32_t p;
@ -96,7 +96,7 @@ power_set(int fd, int power, int workload, int perm)
memset(&pt, 0, sizeof(pt)); memset(&pt, 0, sizeof(pt));
pt.cmd.opc = NVME_OPC_SET_FEATURES; pt.cmd.opc = NVME_OPC_SET_FEATURES;
pt.cmd.cdw10 = NVME_FEAT_POWER_MANAGEMENT | p; pt.cmd.cdw10 = NVME_FEAT_POWER_MANAGEMENT | p;
pt.cmd.cdw11 = power | (workload << 5); pt.cmd.cdw11 = power_val | (workload << 5);
if (ioctl(fd, NVME_PASSTHROUGH_CMD, &pt) < 0) if (ioctl(fd, NVME_PASSTHROUGH_CMD, &pt) < 0)
err(1, "set feature power mgmt request failed"); err(1, "set feature power mgmt request failed");
@ -127,7 +127,7 @@ void
power(int argc, char *argv[]) power(int argc, char *argv[])
{ {
struct nvme_controller_data cdata; struct nvme_controller_data cdata;
int ch, listflag = 0, powerflag = 0, power = 0, fd; int ch, listflag = 0, powerflag = 0, power_val = 0, fd;
int workload = 0; int workload = 0;
char *end; char *end;
@ -138,7 +138,7 @@ power(int argc, char *argv[])
break; break;
case 'p': case 'p':
powerflag = 1; powerflag = 1;
power = strtol(optarg, &end, 0); power_val = strtol(optarg, &end, 0);
if (*end != '\0') { if (*end != '\0') {
fprintf(stderr, "Invalid power state number: %s\n", optarg); fprintf(stderr, "Invalid power state number: %s\n", optarg);
power_usage(); power_usage();
@ -174,7 +174,7 @@ power(int argc, char *argv[])
} }
if (powerflag) { if (powerflag) {
power_set(fd, power, workload, 0); power_set(fd, power_val, workload, 0);
goto out; goto out;
} }
power_show(fd); power_show(fd);