From 04e73042208e4588dc79283297682ba461db910b Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Wed, 15 Feb 2023 17:39:38 +0100 Subject: [PATCH] Fix types used in format strings Signed-off-by: Sebastien GODARD --- common.c | 2 +- pcp_stats.c | 2 +- raw_stats.c | 4 ++-- rd_stats.c | 3 ++- sa_common.c | 14 +++++++------- sadc.c | 8 ++++---- sadf_misc.c | 20 ++++++++++---------- sar.c | 6 +++--- svg_stats.c | 4 ++-- 9 files changed, 32 insertions(+), 31 deletions(-) diff --git a/common.c b/common.c index 725b640..0fc81bb 100644 --- a/common.c +++ b/common.c @@ -1149,7 +1149,7 @@ char *get_device_name(unsigned int major, unsigned int minor, unsigned long long sprintf(xsid, "%016llx", wwn[1]); } if (part_nr) { - sprintf(pn, "-%d", part_nr); + sprintf(pn, "-%u", part_nr); } snprintf(sid, sizeof(sid), "%#016llx%s%s", wwn[0], xsid, pn); dev_name = sid; diff --git a/pcp_stats.c b/pcp_stats.c index e0a9533..069166a 100644 --- a/pcp_stats.c +++ b/pcp_stats.c @@ -1684,7 +1684,7 @@ __print_funct_t pcp_print_pwr_usb_stats(struct activity *a, int curr) suc = (struct stats_pwr_usb *) ((char *) a->buf[curr] + i * a->msize); sprintf(instance, "usb%d", i); - snprintf(buf, sizeof(buf), "%d", suc->bus_nr); + snprintf(buf, sizeof(buf), "%u", suc->bus_nr); pmiPutValue("power.usb.bus", instance, buf); snprintf(buf, sizeof(buf), "%x", suc->vendor_id); diff --git a/raw_stats.c b/raw_stats.c index 3813ccc..62ed06c 100644 --- a/raw_stats.c +++ b/raw_stats.c @@ -684,7 +684,7 @@ __print_funct_t raw_print_net_dev_stats(struct activity *a, char *timestr, int c pval(sndp->tx_compressed, sndc->tx_compressed); printf(" %s", pfield(NULL, 0)); pval(sndp->multicast, sndc->multicast); - printf(" speed; %u; duplex; %u;\n", sndc->speed, sndc->duplex); + printf(" speed; %u; duplex; %u;\n", sndc->speed, (unsigned int) sndc->duplex); } } @@ -1521,7 +1521,7 @@ __print_funct_t raw_print_pwr_usb_stats(struct activity *a, char *timestr, int c printf("%s; %s; \"%s\";", timestr, pfield(a->hdr_line, FIRST), suc->manufacturer); printf(" %s; \"%s\";", pfield(NULL, 0), suc->product); - printf(" %s; %d;", pfield(NULL, 0), suc->bus_nr); + printf(" %s; %u;", pfield(NULL, 0), suc->bus_nr); printf(" %s; %x;", pfield(NULL, 0), suc->vendor_id); printf(" %s; %x;", pfield(NULL, 0), suc->product_id); printf(" %s; %u;\n", pfield(NULL, 0), suc->bmaxpower); diff --git a/rd_stats.c b/rd_stats.c index c325dfe..77fe96f 100644 --- a/rd_stats.c +++ b/rd_stats.c @@ -2808,7 +2808,8 @@ int read_softnet(struct stats_softnet *st_softnet, __nr_t nr_alloc, FILE *fp; struct stats_softnet *st_softnet_i, st_softnet_read; char line[1024]; - int cpu = 1, rc = 1, i, cpu_id; + int rc = 1, i; + unsigned int cpu = 1, cpu_id; /* Open /proc/net/softnet_stat file */ if ((fp = fopen(NET_SOFTNET, "r")) == NULL) diff --git a/sa_common.c b/sa_common.c index 1596352..4a4d140 100644 --- a/sa_common.c +++ b/sa_common.c @@ -1496,7 +1496,7 @@ int skip_extra_struct(int ifd, int endian_mismatch, int arch_64) /* Check values consistency */ if (MAP_SIZE(xtra_d.extra_types_nr) > xtra_d.extra_size) { #ifdef DEBUG - fprintf(stderr, "%s: extra_size=%u types=%d,%d,%d\n", + fprintf(stderr, "%s: extra_size=%u types=%u,%u,%u\n", __FUNCTION__, xtra_d.extra_size, xtra_d.extra_types_nr[0], xtra_d.extra_types_nr[1], xtra_d.extra_types_nr[2]); #endif @@ -1586,7 +1586,7 @@ int read_record_hdr(int ifd, void *buffer, struct record_header *record_hdr, if ((record_hdr->record_type <= 0) || (record_hdr->record_type > R_EXTRA_MAX) || (record_hdr->hour > 23) || (record_hdr->minute > 59) || (record_hdr->second > 60) || (record_hdr->ust_time < 1000000000)) { #ifdef DEBUG - fprintf(stderr, "%s: record_type=%d HH:MM:SS=%02d:%02d:%02d (%lld)\n", + fprintf(stderr, "%s: record_type=%d HH:MM:SS=%02d:%02d:%02d (%llu)\n", __FUNCTION__, record_hdr->record_type, record_hdr->hour, record_hdr->minute, record_hdr->second, record_hdr->ust_time); @@ -2039,7 +2039,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f (MAP_SIZE(file_hdr->act_types_nr) > file_hdr->act_size) || (MAP_SIZE(file_hdr->rec_types_nr) > file_hdr->rec_size)) { #ifdef DEBUG - fprintf(stderr, "%s: sa_act_nr=%d act_size=%u rec_size=%u map_size(act)=%u map_size(rec)=%u\n", + fprintf(stderr, "%s: sa_act_nr=%u act_size=%u rec_size=%u map_size(act)=%u map_size(rec)=%u\n", __FUNCTION__, file_hdr->sa_act_nr, file_hdr->act_size, file_hdr->rec_size, MAP_SIZE(file_hdr->act_types_nr), MAP_SIZE(file_hdr->rec_types_nr)); #endif @@ -2093,7 +2093,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f (fal->nr > NR_MAX) || (fal->nr2 > NR2_MAX) || (fal->size <= 0) || (fal->size > MAX_ITEM_STRUCT_SIZE)) { #ifdef DEBUG - fprintf(stderr, "%s: id=%d nr=%d nr2=%d size=%d\n", + fprintf(stderr, "%s: id=%u nr=%d nr2=%d size=%d\n", __FUNCTION__, fal->id, fal->nr, fal->nr2, fal->size); #endif goto format_error; @@ -2113,7 +2113,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f /* Check max value for known activities */ if (fal->nr > act[p]->nr_max) { #ifdef DEBUG - fprintf(stderr, "%s: id=%d nr=%d nr_max=%d\n", + fprintf(stderr, "%s: id=%u nr=%d nr_max=%d\n", __FUNCTION__, fal->id, fal->nr, act[p]->nr_max); #endif goto format_error; @@ -2136,7 +2136,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f (fal->types_nr[2] <= act[p]->gtypes_nr[2]))) && (fal->magic == act[p]->magic) && !DISPLAY_HDR_ONLY(flags)) { #ifdef DEBUG - fprintf(stderr, "%s: id=%d file=%d,%d,%d activity=%d,%d,%d\n", + fprintf(stderr, "%s: id=%u file=%u,%u,%u activity=%u,%u,%u\n", __FUNCTION__, fal->id, fal->types_nr[0], fal->types_nr[1], fal->types_nr[2], act[p]->gtypes_nr[0], act[p]->gtypes_nr[1], act[p]->gtypes_nr[2]); #endif @@ -2145,7 +2145,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f if (MAP_SIZE(fal->types_nr) > fal->size) { #ifdef DEBUG - fprintf(stderr, "%s: id=%d size=%u map_size=%u\n", + fprintf(stderr, "%s: id=%u size=%d map_size=%u\n", __FUNCTION__, fal->id, fal->size, MAP_SIZE(fal->types_nr)); #endif goto format_error; diff --git a/sadc.c b/sadc.c index b113163..76fc2b1 100644 --- a/sadc.c +++ b/sadc.c @@ -835,7 +835,7 @@ void open_ofile(int *ofd, char ofile[], int restart_mark) return; } #ifdef DEBUG - fprintf(stderr, "%s: Size read=%zd sysstat_magic=%x format_magic=%x header_size=%u header=%d,%d,%d\n", + fprintf(stderr, "%s: Size read=%zd sysstat_magic=%x format_magic=%x header_size=%u header=%u,%u,%u\n", __FUNCTION__, sz, file_magic.sysstat_magic, file_magic.format_magic, file_magic.header_size, file_magic.hdr_types_nr[0], file_magic.hdr_types_nr[1], file_magic.hdr_types_nr[2]); #endif @@ -870,7 +870,7 @@ void open_ofile(int *ofd, char ofile[], int restart_mark) /* OK: It's a true system activity file */ if (!file_hdr.sa_act_nr || (file_hdr.sa_act_nr > NR_ACT)) { #ifdef DEBUG - fprintf(stderr, "%s: sa_act_nr=%d\n", + fprintf(stderr, "%s: sa_act_nr=%u\n", __FUNCTION__, file_hdr.sa_act_nr); #endif /* @@ -890,7 +890,7 @@ void open_ofile(int *ofd, char ofile[], int restart_mark) (file_hdr.rec_types_nr[1] != RECORD_HEADER_UL_NR) || (file_hdr.rec_types_nr[2] != RECORD_HEADER_U_NR)) { #ifdef DEBUG - fprintf(stderr, "%s: act_size=%u act=%d,%d,%d rec_size=%u rec=%d,%d,%d\n", + fprintf(stderr, "%s: act_size=%u act=%u,%u,%u rec_size=%u rec=%u,%u,%u\n", __FUNCTION__, file_hdr.act_size, file_hdr.act_types_nr[0], file_hdr.act_types_nr[1], file_hdr.act_types_nr[2], file_hdr.rec_size, @@ -951,7 +951,7 @@ void open_ofile(int *ofd, char ofile[], int restart_mark) (file_act[i].types_nr[1] != act[p]->gtypes_nr[1]) || (file_act[i].types_nr[2] != act[p]->gtypes_nr[2])) { #ifdef DEBUG - fprintf(stderr, "%s: %s: types=%d,%d,%d/%d,%d,%d\n", + fprintf(stderr, "%s: %s: types=%u,%u,%u/%u,%u,%u\n", __FUNCTION__, act[p]->name, file_act[i].types_nr[0], file_act[i].types_nr[1], file_act[i].types_nr[2], act[p]->gtypes_nr[0], act[p]->gtypes_nr[1], act[p]->gtypes_nr[2]); diff --git a/sadf_misc.c b/sadf_misc.c index 1dea64f..2f14348 100644 --- a/sadf_misc.c +++ b/sadf_misc.c @@ -93,7 +93,7 @@ void print_dbppc_restart(char *cur_date, char *cur_time, char *my_tz, char sep, : (PRINT_TRUE_TIME(flags) ? file_hdr->sa_tzname : "UTC")); } - printf("%cLINUX-RESTART\t(%d CPU)\n", + printf("%cLINUX-RESTART\t(%u CPU)\n", sep, file_hdr->sa_cpu_nr > 1 ? file_hdr->sa_cpu_nr - 1 : 1); } @@ -258,7 +258,7 @@ __printf_funct_t print_raw_restart(int *tab, int action, char *cur_date, char *c : (PRINT_TRUE_TIME(flags) ? file_hdr->sa_tzname : "UTC")); } - printf("; LINUX-RESTART (%d CPU)\n", + printf("; LINUX-RESTART (%u CPU)\n", file_hdr->sa_cpu_nr > 1 ? file_hdr->sa_cpu_nr - 1 : 1); } } @@ -828,7 +828,7 @@ char *print_dbppc_timestamp(int fmt, struct file_header *file_hdr, char *cur_dat char temp1[128], temp2[256]; /* This substring appears on every output line, preformat it here */ - snprintf(temp1, sizeof(temp1), "%s%s%lld%s", + snprintf(temp1, sizeof(temp1), "%s%s%llu%s", file_hdr->sa_nodename, seps[isdb], itv, seps[isdb]); if (strlen(cur_date)) { snprintf(temp2, sizeof(temp2), "%s%s ", temp1, cur_date); @@ -1277,13 +1277,13 @@ __printf_funct_t print_hdr_header(void *parm, int action, char *dfile, char *my_ if (gmtime_r(&t, &loc_t) != NULL) { printf(_("File time: ")); strftime(cur_time, sizeof(cur_time), "%T", &loc_t); - printf("%s UTC (%lld)\n", cur_time, file_hdr->sa_ust_time); + printf("%s UTC (%llu)\n", cur_time, file_hdr->sa_ust_time); } printf(_("Timezone: %s\n"), file_hdr->sa_tzname); /* File composition: file_header, file_activity, record_header */ - printf(_("File composition: (%d,%d,%d),(%d,%d,%d),(%d,%d,%d)\n"), + printf(_("File composition: (%u,%u,%u),(%u,%u,%u),(%u,%u,%u)\n"), file_magic->hdr_types_nr[0], file_magic->hdr_types_nr[1], file_magic->hdr_types_nr[2], file_hdr->act_types_nr[0], file_hdr->act_types_nr[1], file_hdr->act_types_nr[2], file_hdr->rec_types_nr[0], file_hdr->rec_types_nr[1], file_hdr->rec_types_nr[2]); @@ -1301,7 +1301,7 @@ __printf_funct_t print_hdr_header(void *parm, int action, char *dfile, char *my_ p = get_activity_position(act, fal->id, RESUME_IF_NOT_FOUND); - printf("%02d: [%02x] ", fal->id, fal->magic); + printf("%02u: [%02x] ", fal->id, fal->magic); if (p >= 0) { printf("%-20s", act[p]->name); } @@ -1312,7 +1312,7 @@ __printf_funct_t print_hdr_header(void *parm, int action, char *dfile, char *my_ if (fal->nr2 > 1) { printf("x%d", fal->nr2); } - printf("\t(%d,%d,%d)", fal->types_nr[0], fal->types_nr[1], fal->types_nr[2]); + printf("\t(%u,%u,%u)", fal->types_nr[0], fal->types_nr[1], fal->types_nr[2]); if ((p >= 0) && (act[p]->magic != fal->magic)) { printf(_(" \t[Unknown format]")); } @@ -1381,7 +1381,7 @@ __printf_funct_t print_svg_header(void *parm, int action, char *dfile, char *my_ /* Min canvas height is 100 (at least to display "No data") */ height = 100; } - printf(" width=\"%d\" height=\"%d\"" + printf(" width=\"%d\" height=\"%u\"" " fill=\"black\" stroke=\"#%06x\" stroke-width=\"1\">\n", SVG_T_XSIZE * (hdr_parm->views_per_row), height, svg_colors[palette][SVG_COL_DEFAULT_IDX]); @@ -1402,9 +1402,9 @@ __printf_funct_t print_svg_header(void *parm, int action, char *dfile, char *my_ if (!IS_SELECTED(act[p]->options) || !act[p]->g_nr) continue; /* Activity not selected or no graph available */ - printf("\n", + printf("\n", act[p]->id, act[p]->name); - printf("%s\n", + printf("%s\n", SVG_H_YSIZE + ht, act[p]->desc); ht += SVG_C_YSIZE; } diff --git a/sar.c b/sar.c index 27eb203..4f06172 100644 --- a/sar.c +++ b/sar.c @@ -617,7 +617,7 @@ __printf_funct_t print_sar_restart(int *tab, int action, char *cur_date, char *c char restart[64]; printf("\n%-11s", cur_time); - sprintf(restart, " LINUX RESTART\t(%d CPU)\n", + sprintf(restart, " LINUX RESTART\t(%u CPU)\n", file_hdr->sa_cpu_nr > 1 ? file_hdr->sa_cpu_nr - 1 : 1); cprintf_s(IS_RESTART, "%s", restart); @@ -927,7 +927,7 @@ void read_header_data(void) /* All activities are not necessarily selected, but NR_ACT is a max */ if (file_hdr.sa_act_nr > NR_ACT) { #ifdef DEBUG - fprintf(stderr, "%s: sa_act_nr=%d\n", __FUNCTION__, file_hdr.sa_act_nr); + fprintf(stderr, "%s: sa_act_nr=%u\n", __FUNCTION__, file_hdr.sa_act_nr); #endif print_read_error(INCONSISTENT_INPUT_DATA); } @@ -965,7 +965,7 @@ void read_header_data(void) fprintf(stderr, "%s: p=%d\n", __FUNCTION__, p); } else { - fprintf(stderr, "%s: %s: size=%d/%d magic=%x/%x nr=%d nr2=%d types=%d,%d,%d/%d,%d,%d\n", + fprintf(stderr, "%s: %s: size=%d/%d magic=%x/%x nr=%d nr2=%d types=%u,%u,%u/%u,%u,%u\n", __FUNCTION__, act[p]->name, act[p]->fsize, file_act.size, act[p]->magic, file_act.magic, file_act.nr, file_act.nr2, act[p]->gtypes_nr[0], act[p]->gtypes_nr[1], act[p]->gtypes_nr[2], diff --git a/svg_stats.c b/svg_stats.c index e1196a6..fb89e62 100644 --- a/svg_stats.c +++ b/svg_stats.c @@ -947,7 +947,7 @@ int draw_activity_graphs(int g_nr, int g_type[], char *title[], char *g_title[], if (!displayed) { /* Translate to proper position for current activity */ - printf("\n", + printf("\n", a->id, xid, SVG_H_YSIZE + SVG_C_YSIZE * (DISPLAY_TOC(flags) ? svg_p->nr_act_dispd : 0) + @@ -2225,7 +2225,7 @@ __print_funct_t svg_print_disk_stats(struct activity *a, int curr, int action, s if (k == a->item_list_sz) { /* No free graph entry: Ignore it (should never happen) */ #ifdef DEBUG - fprintf(stderr, "%s: Name=%s major=%d minor=%d\n", + fprintf(stderr, "%s: Name=%s major=%u minor=%u\n", __FUNCTION__, dev_name, sdc->major, sdc->minor); #endif continue; -- 2.40.0