emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

pmap: trade inept width approach for printf's built-in

Browse Source 
When the new -X/-XX options were introduced, the width
and justification requirements were satisfied with a 2
step approach. First, format strings would dynamically
be built and then employed in the subsequent printf().

This was a total waste of time and resources since the
printf family of functions provide for the '*' width &
precision conventions to meet this need via arguments.

But even more importantly that foolish endeavor always
hides the potential warnings like the one shown below.

Henceforth this pmap will printf in the proper manner!

Reference(s):
       new options for pmap
commit faec340719
pmap.c:459:4: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2013-03-16 00:00:00 -05:00 committed by Jaromir Capik
parent 9db537503d
commit 3262143a29
1 changed files with 34 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
pmap.c
View File

@ -257,7 +257,7 @@ static void print_extended_maps (FILE *f)
detail_desc[DETAIL_LENGTH], value_str[NUM_LENGTH],
start[NUM_LENGTH], end[NUM_LENGTH],
offset[NUM_LENGTH], inode[NUM_LENGTH],
dev[64], fmt_str[64], vmflags[VMFLAGS_LENGTH];
dev[64], vmflags[VMFLAGS_LENGTH];
int maxw1=0, maxw2=0, maxw3=0, maxw4=0, maxw5=0, maxwv=0;
int nfields, firstmapping, footer_gap, i, width_of_total;
unsigned KLONG value;
@ -368,74 +368,52 @@ loop_end:
/* Print header */
if (firstmapping && !q_option) {
sprintf(fmt_str, "%%%ds", maxw1); /* Address field always enabled */
printf(fmt_str, "Address");
printf("%*s", maxw1, "Address"); /* Address field always enabled */
if (is_enabled("Flags")) {
sprintf(fmt_str, " %%%ds", maxw2);
printf(fmt_str, "Flags");
}
if (is_enabled("Offset")) {
sprintf(fmt_str, " %%%ds", maxw3);
printf(fmt_str, "Offset");
}
if (is_enabled("Device")) {
sprintf(fmt_str, " %%%ds", maxw4);
printf(fmt_str, "Device");
}
if (is_enabled("Inode")) {
sprintf(fmt_str, " %%%ds", maxw5);
printf(fmt_str, "Inode");
}
if (is_enabled("Flags"))
printf(" %*s", maxw2, "Flags");
for (listnode=listhead; listnode!=NULL; listnode=listnode->next) {
sprintf(fmt_str, " %%%ds", listnode->max_width);
printf(fmt_str, listnode->description);
}
if (is_enabled("Offset"))
printf(" %*s", maxw3, "Offset");
if (has_vmflags && is_enabled("VmFlags")) {
sprintf(fmt_str, " %%%ds", maxwv);
printf(fmt_str, "VmFlags");
}
if (is_enabled("Device"))
printf(" %*s", maxw4, "Device");
if (is_enabled("Mapping")) printf(" %s", "Mapping");
if (is_enabled("Inode"))
printf(" %*s", maxw5, "Inode");
for (listnode=listhead; listnode!=NULL; listnode=listnode->next)
printf(" %*s", listnode->max_width, listnode->description);
if (has_vmflags && is_enabled("VmFlags"))
printf(" %*s", maxwv, "VmFlags");
if (is_enabled("Mapping"))
printf(" %s", "Mapping");
printf("\n");
}
/* Print data */
sprintf(fmt_str, "%%%ds", maxw1); /* Address field is always enabled */
printf(fmt_str, start);
printf("%*s", maxw1, start); /* Address field is always enabled */
if (is_enabled("Flags")) {
sprintf(fmt_str, " %%%ds", maxw2);
printf(fmt_str, flags);
}
if (is_enabled("Flags"))
printf(" %*s", maxw2, flags);
if (is_enabled("Offset")) {
sprintf(fmt_str, " %%%ds", maxw3);
printf(fmt_str, offset);
}
if (is_enabled("Offset"))
printf(" %*s", maxw3, offset);
if (is_enabled("Device")) {
sprintf(fmt_str, " %%%ds", maxw4);
printf(fmt_str, dev);
}
if (is_enabled("Device"))
printf(" %*s", maxw4, dev);
if (is_enabled("Inode")) {
sprintf(fmt_str, " %%%ds", maxw5);
printf(fmt_str, inode);
}
if (is_enabled("Inode"))
printf(" %*s", maxw5, inode);
for (listnode=listhead; listnode!=NULL; listnode=listnode->next) {
sprintf(fmt_str, " %%%ds", listnode->max_width);
printf(fmt_str, listnode->value_str);
}
for (listnode=listhead; listnode!=NULL; listnode=listnode->next)
printf(" %*s", listnode->max_width, listnode->value_str);
if (has_vmflags && is_enabled("VmFlags")) {
sprintf(fmt_str, " %%%ds", maxwv);
printf(fmt_str, vmflags);
}
if (has_vmflags && is_enabled("VmFlags"))
printf(" %*s", maxwv, vmflags);
if (is_enabled("Mapping")) {
if (map_desc_showpath) {
@ -478,10 +456,8 @@ loop_end:
for (i=0; i<footer_gap; i++) putc(' ', stdout);
for (listnode=listhead; listnode!=NULL; listnode=listnode->next) {
sprintf(fmt_str, "%%%dd ", listnode->max_width);
printf(fmt_str, listnode->total);
}
for (listnode=listhead; listnode!=NULL; listnode=listnode->next)
printf("%*lu ", listnode->max_width, listnode->total);
fputs("KB \n", stdout);
}