ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hexdump: code shrink

Browse source 
function                                             old     new   delta
add_format                                             -      50     +50
add_first                                             10       -     -10
hexdump_main                                         401     366     -35
.rodata                                           105306  105255     -51
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/2 up/down: 50/-96)            Total: -46 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2023-05-26 16:43:40 +02:00
parent 283cba78f2
commit d7814f5727
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
util-linux/hexdump.c
View file

@ -72,14 +72,20 @@ static void bb_dump_addfile(dumper_t *dumper, char *name)
} }
static const char *const add_strings[] ALIGN_PTR = { static const char *const add_strings[] ALIGN_PTR = {
"\"%07_ax\"16/1 \" %03o\"" "\"\n\"", /* b */ "16/1 \" %03o" , /* b */
"\"%07_ax\"16/1 \" %3_c\"" "\"\n\"", /* c */ "16/1 \" %3_c" , /* c */
"\"%07_ax\"8/2 \" %05u\"" "\"\n\"", /* d */ "8/2 \" %05u" , /* d */
"\"%07_ax\"8/2 \" %06o\"" "\"\n\"", /* o */ "8/2 \" %06o" , /* o */
"\"%07_ax\"8/2 \" %04x\"" "\"\n\"", /* x */ "8/2 \" %04x", /* x */
}; };
static const char add_first[] ALIGN1 = "\"%07_Ax\n\""; static void add_format(dumper_t *dumper, const char *fmt)
{
char fmtbuf[sizeof("\"%07_ax\"" "%s\"" "\"\n\"") + 16];
sprintf(fmtbuf, "\"%%07_ax\"" "%s\"" "\"\n\"", fmt);
bb_dump_add(dumper, "\"%07_Ax\n\"");
bb_dump_add(dumper, fmtbuf);
}
static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v"; static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v";
@ -104,8 +110,7 @@ int hexdump_main(int argc, char **argv)
if (!p) if (!p)
bb_show_usage(); bb_show_usage();
if ((p - hexdump_opts) < 5) { if ((p - hexdump_opts) < 5) {
bb_dump_add(dumper, add_first); add_format(dumper, add_strings[(int)(p - hexdump_opts)]);
bb_dump_add(dumper, add_strings[(int)(p - hexdump_opts)]);
} }
/* Save a little bit of space below by omitting the 'else's. */ /* Save a little bit of space below by omitting the 'else's. */
if (ch == 'C') { if (ch == 'C') {
@ -139,8 +144,7 @@ int hexdump_main(int argc, char **argv)
} }
if (!dumper->fshead) { if (!dumper->fshead) {
bb_dump_add(dumper, add_first); add_format(dumper, "8/2 \" %04x");
bb_dump_add(dumper, "\"%07_ax\"8/2 \" %04x\"\"\n\"");
} }
argv += optind; argv += optind;