diff options
author | Boris Egorov | 2015-06-19 21:40:59 +0200 |
---|---|---|
committer | Karel Zak | 2015-06-25 12:08:45 +0200 |
commit | e3ca1312a20424501144cebe6c2e6e78a5bf6db1 (patch) | |
tree | 8308000b8bfb0ea1796254b155d04d0f31701660 /sys-utils | |
parent | rename: allow full-path renames (diff) | |
download | kernel-qcow2-util-linux-e3ca1312a20424501144cebe6c2e6e78a5bf6db1.tar.gz kernel-qcow2-util-linux-e3ca1312a20424501144cebe6c2e6e78a5bf6db1.tar.xz kernel-qcow2-util-linux-e3ca1312a20424501144cebe6c2e6e78a5bf6db1.zip |
sys-utils/disk-utils/lib: fix printf format types [cppcheck]
Fix 'invalidPrintfArgType' cppcheck warnings
Signed-off-by: Boris Egorov <egorov@linux.com>
Diffstat (limited to 'sys-utils')
-rw-r--r-- | sys-utils/chcpu.c | 38 | ||||
-rw-r--r-- | sys-utils/hwclock-rtc.c | 2 | ||||
-rw-r--r-- | sys-utils/ipcs.c | 4 | ||||
-rw-r--r-- | sys-utils/readprofile.c | 12 |
4 files changed, 28 insertions, 28 deletions
diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c index 428fdc271..50b834c0a 100644 --- a/sys-utils/chcpu.c +++ b/sys-utils/chcpu.c @@ -84,22 +84,22 @@ static int cpu_enable(cpu_set_t *cpu_set, size_t setsize, int enable) if (!CPU_ISSET(cpu, cpu_set)) continue; if (!path_exist(_PATH_SYS_CPU "/cpu%d", cpu)) { - warnx(_("CPU %d does not exist"), cpu); + warnx(_("CPU %u does not exist"), cpu); fails++; continue; } if (!path_exist(_PATH_SYS_CPU "/cpu%d/online", cpu)) { - warnx(_("CPU %d is not hot pluggable"), cpu); + warnx(_("CPU %u is not hot pluggable"), cpu); fails++; continue; } online = path_read_s32(_PATH_SYS_CPU "/cpu%d/online", cpu); if ((online == 1) && (enable == 1)) { - printf(_("CPU %d is already enabled\n"), cpu); + printf(_("CPU %u is already enabled\n"), cpu); continue; } if ((online == 0) && (enable == 0)) { - printf(_("CPU %d is already disabled\n"), cpu); + printf(_("CPU %u is already disabled\n"), cpu); continue; } if (path_exist(_PATH_SYS_CPU "/cpu%d/configure", cpu)) @@ -107,25 +107,25 @@ static int cpu_enable(cpu_set_t *cpu_set, size_t setsize, int enable) if (enable) { rc = path_write_str("1", _PATH_SYS_CPU "/cpu%d/online", cpu); if ((rc == -1) && (configured == 0)) { - warn(_("CPU %d enable failed (CPU is deconfigured)"), cpu); + warn(_("CPU %u enable failed (CPU is deconfigured)"), cpu); fails++; } else if (rc == -1) { - warn(_("CPU %d enable failed"), cpu); + warn(_("CPU %u enable failed"), cpu); fails++; } else - printf(_("CPU %d enabled\n"), cpu); + printf(_("CPU %u enabled\n"), cpu); } else { if (onlinecpus && num_online_cpus() == 1) { - warnx(_("CPU %d disable failed (last enabled CPU)"), cpu); + warnx(_("CPU %u disable failed (last enabled CPU)"), cpu); fails++; continue; } rc = path_write_str("0", _PATH_SYS_CPU "/cpu%d/online", cpu); if (rc == -1) { - warn(_("CPU %d disable failed"), cpu); + warn(_("CPU %u disable failed"), cpu); fails++; } else { - printf(_("CPU %d disabled\n"), cpu); + printf(_("CPU %u disabled\n"), cpu); if (onlinecpus) CPU_CLR(cpu, onlinecpus); } @@ -176,44 +176,44 @@ static int cpu_configure(cpu_set_t *cpu_set, size_t setsize, int configure) if (!CPU_ISSET(cpu, cpu_set)) continue; if (!path_exist(_PATH_SYS_CPU "/cpu%d", cpu)) { - warnx(_("CPU %d does not exist"), cpu); + warnx(_("CPU %u does not exist"), cpu); fails++; continue; } if (!path_exist(_PATH_SYS_CPU "/cpu%d/configure", cpu)) { - warnx(_("CPU %d is not configurable"), cpu); + warnx(_("CPU %u is not configurable"), cpu); fails++; continue; } current = path_read_s32(_PATH_SYS_CPU "/cpu%d/configure", cpu); if ((current == 1) && (configure == 1)) { - printf(_("CPU %d is already configured\n"), cpu); + printf(_("CPU %u is already configured\n"), cpu); continue; } if ((current == 0) && (configure == 0)) { - printf(_("CPU %d is already deconfigured\n"), cpu); + printf(_("CPU %u is already deconfigured\n"), cpu); continue; } if ((current == 1) && (configure == 0) && onlinecpus && is_cpu_online(cpu)) { - warnx(_("CPU %d deconfigure failed (CPU is enabled)"), cpu); + warnx(_("CPU %u deconfigure failed (CPU is enabled)"), cpu); fails++; continue; } if (configure) { rc = path_write_str("1", _PATH_SYS_CPU "/cpu%d/configure", cpu); if (rc == -1) { - warn(_("CPU %d configure failed"), cpu); + warn(_("CPU %u configure failed"), cpu); fails++; } else - printf(_("CPU %d configured\n"), cpu); + printf(_("CPU %u configured\n"), cpu); } else { rc = path_write_str("0", _PATH_SYS_CPU "/cpu%d/configure", cpu); if (rc == -1) { - warn(_("CPU %d deconfigure failed"), cpu); + warn(_("CPU %u deconfigure failed"), cpu); fails++; } else - printf(_("CPU %d deconfigured\n"), cpu); + printf(_("CPU %u deconfigured\n"), cpu); } } diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c index 91721f3f3..812b65b8a 100644 --- a/sys-utils/hwclock-rtc.c +++ b/sys-utils/hwclock-rtc.c @@ -471,7 +471,7 @@ int set_epoch_rtc(unsigned long epoch) } if (debug) - printf(_("setting epoch to %ld " + printf(_("setting epoch to %lu " "with RTC_EPOCH_SET ioctl to %s.\n"), epoch, rtc_dev_name); diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c index 74d87662f..eaab92268 100644 --- a/sys-utils/ipcs.c +++ b/sys-utils/ipcs.c @@ -359,7 +359,7 @@ static void do_sem (char format) printf (_("max semaphores per array = %d\n"), lim.semmsl); printf (_("max semaphores system wide = %d\n"), lim.semmns); printf (_("max ops per semop call = %d\n"), lim.semopm); - printf (_("semaphore max value = %d\n"), lim.semvmx); + printf (_("semaphore max value = %u\n"), lim.semvmx); return; } case STATUS: @@ -649,7 +649,7 @@ static void print_sem(int semid) for (i = 0; i < semdata->sem_nsems; i++) { struct sem_elem *e = &semdata->elements[i]; - printf("%-10zd %-10d %-10d %-10d %-10d\n", + printf("%-10zu %-10d %-10d %-10d %-10d\n", i, e->semval, e->ncount, e->zcount, e->pid); } printf("\n"); diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c index eb6b8ec88..3ba866e24 100644 --- a/sys-utils/readprofile.c +++ b/sys-utils/readprofile.c @@ -283,7 +283,7 @@ int main(int argc, char **argv) step = buf[0]; if (optInfo) { - printf(_("Sampling_step: %i\n"), step); + printf(_("Sampling_step: %u\n"), step); exit(EXIT_SUCCESS); } @@ -364,10 +364,10 @@ int main(int argc, char **argv) } else if ((this || optAll) && (fn_len = next_add - fn_add) != 0) { if (optVerbose) - printf("%016llx %-40s %6i %8.4f\n", fn_add, + printf("%016llx %-40s %6u %8.4f\n", fn_add, fn_name, this, this / (double)fn_len); else - printf("%6i %-40s %8.4f\n", + printf("%6u %-40s %8.4f\n", this, fn_name, this / (double)fn_len); if (optSub) { unsigned long long scan; @@ -393,14 +393,14 @@ int main(int argc, char **argv) } /* clock ticks, out of kernel text - probably modules */ - printf("%6i %s\n", buf[len / sizeof(*buf) - 1], "*unknown*"); + printf("%6u %s\n", buf[len / sizeof(*buf) - 1], "*unknown*"); /* trailer */ if (optVerbose) - printf("%016x %-40s %6i %8.4f\n", + printf("%016x %-40s %6u %8.4f\n", 0, "total", total, total / (double)(fn_add - add0)); else - printf("%6i %-40s %8.4f\n", + printf("%6u %-40s %8.4f\n", total, _("total"), total / (double)(fn_add - add0)); popenMap ? pclose(map) : fclose(map); |