matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix non-literal string format warnings 

The lnstat program was building a format string, then using it.
This was safe, but simpler to just use format character * to
get width.
This commit is contained in:
Stephen Hemminger 2014-05-29 10:49:55 -07:00
parent 4ec0ffde42
commit 468dec75a5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
misc/lnstat.c
View File

@ -98,11 +98,8 @@ static void print_line(FILE *of, const struct lnstat_file *lnstat_files,
for (i = 0; i < fp->num; i++) { for (i = 0; i < fp->num; i++) {
const struct lnstat_field *lf = fp->params[i].lf; const struct lnstat_field *lf = fp->params[i].lf;
char formatbuf[255];
snprintf(formatbuf, sizeof(formatbuf)-1, "%%%ulu|", fprintf(of, "%*lu|", fp->params[i].print.width, lf->result);
fp->params[i].print.width);
fprintf(of, formatbuf, lf->result);
} }
fputc('\n', of); fputc('\n', of);
} }
@ -198,21 +195,20 @@ static struct table_hdr *build_hdr_string(struct lnstat_file *lnstat_files,
for (i = 0; i < fps->num; i++) { for (i = 0; i < fps->num; i++) {
char *cname, *fname = fps->params[i].lf->name; char *cname, *fname = fps->params[i].lf->name;
char fmt[12];
unsigned int width = fps->params[i].print.width; unsigned int width = fps->params[i].print.width;
snprintf(fmt, sizeof(fmt)-1, "%%%u.%us|", width, width); snprintf(th.hdr[0]+ofs, width+2, "%*.*s|", width, width,
snprintf(th.hdr[0]+ofs, width+2, fmt,
fps->params[i].lf->file->basename); fps->params[i].lf->file->basename);
cname = fname; cname = fname;
for (h = 1; h < HDR_LINES; h++) { for (h = 1; h < HDR_LINES; h++) {
if (cname - fname >= strlen(fname)) if (cname - fname >= strlen(fname))
snprintf(th.hdr[h]+ofs, width+2, fmt, ""); snprintf(th.hdr[h]+ofs, width+2,
"%*.*s|", width, width, "");
else { else {
th.num_lines = h+1; th.num_lines = h+1;
snprintf(th.hdr[h]+ofs, width+2, fmt, cname); snprintf(th.hdr[h]+ofs, width+2,
"%*.*s|", width, width, cname);
} }
cname += width; cname += width;
} }