mirror of
https://github.com/sheumann/hush.git
synced 2024-12-26 10:32:02 +00:00
multiplier suffixes are short, store them directly in struct suffix_mult
function old new delta xstrtoul_range_sfx 226 217 -9 xstrtoull_range_sfx 291 280 -11 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-20) Total: -20 bytes text data bss dec hex filename 669128 2668 13616 685412 a7564 busybox_old 669108 2668 13616 685392 a7550 busybox_unstripped
This commit is contained in:
parent
7587870617
commit
f868963c67
@ -25,7 +25,7 @@ static const struct suffix_mult dd_suffixes[] = {
|
||||
{ "M", 1048576 },
|
||||
{ "GD", 1000000000 },
|
||||
{ "G", 1073741824 },
|
||||
{ NULL, 0 }
|
||||
{ }
|
||||
};
|
||||
|
||||
struct globals {
|
||||
|
@ -25,7 +25,7 @@ static const struct suffix_mult head_suffixes[] = {
|
||||
{ "b", 512 },
|
||||
{ "k", 1024 },
|
||||
{ "m", 1024*1024 },
|
||||
{ NULL, 0 }
|
||||
{ }
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@ -981,7 +981,7 @@ parse_old_offset(const char *s, off_t *offset)
|
||||
static const struct suffix_mult Bb[] = {
|
||||
{ "B", 1024 },
|
||||
{ "b", 512 },
|
||||
{ NULL, 0 }
|
||||
{ }
|
||||
};
|
||||
char *p;
|
||||
int radix;
|
||||
@ -1204,7 +1204,7 @@ int od_main(int argc, char **argv)
|
||||
{ "b", 512 },
|
||||
{ "k", 1024 },
|
||||
{ "m", 1024*1024 },
|
||||
{ NULL, 0 }
|
||||
{ }
|
||||
};
|
||||
unsigned opt;
|
||||
int l_c_m;
|
||||
|
@ -29,7 +29,7 @@ static const struct suffix_mult sfx[] = {
|
||||
{ "m", 60 },
|
||||
{ "h", 60*60 },
|
||||
{ "d", 24*60*60 },
|
||||
{ NULL, 0 }
|
||||
{ }
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@ -20,7 +20,7 @@ static const struct suffix_mult split_suffices[] = {
|
||||
#if ENABLE_FEATURE_SPLIT_FANCY
|
||||
{ "g", 1024*1024*1024 },
|
||||
#endif
|
||||
{ NULL, 0 }
|
||||
{ }
|
||||
};
|
||||
|
||||
/* Increment the suffix part of the filename.
|
||||
|
@ -524,10 +524,10 @@ static void display_window_size(const int fancy)
|
||||
}
|
||||
|
||||
static const struct suffix_mult stty_suffixes[] = {
|
||||
{"b", 512 },
|
||||
{"k", 1024},
|
||||
{"B", 1024},
|
||||
{NULL, 0 }
|
||||
{ "b", 512 },
|
||||
{ "k", 1024 },
|
||||
{ "B", 1024 },
|
||||
{ }
|
||||
};
|
||||
|
||||
static const struct mode_info *find_mode(const char *name)
|
||||
|
@ -30,7 +30,7 @@ static const struct suffix_mult tail_suffixes[] = {
|
||||
{ "b", 512 },
|
||||
{ "k", 1024 },
|
||||
{ "m", 1024*1024 },
|
||||
{ NULL, 0 }
|
||||
{ }
|
||||
};
|
||||
|
||||
struct globals {
|
||||
|
@ -760,10 +760,10 @@ static action*** parse_params(char **argv)
|
||||
static const struct suffix_mult find_suffixes[] = {
|
||||
{ "c", 1 },
|
||||
{ "w", 2 },
|
||||
{ "b"+1, 512 },
|
||||
{ "", 512 },
|
||||
{ "b", 512 },
|
||||
{ "k", 1024 },
|
||||
{ NULL, 0 }
|
||||
{ }
|
||||
};
|
||||
action_size *ap;
|
||||
ap = ALLOC_ACTION(size);
|
||||
|
@ -451,7 +451,7 @@ const char *make_human_readable_str(unsigned long long size,
|
||||
char *bin2hex(char *buf, const char *cp, int count);
|
||||
|
||||
struct suffix_mult {
|
||||
const char *suffix;
|
||||
char suffix[4];
|
||||
unsigned mult;
|
||||
};
|
||||
#include "xatonum.h"
|
||||
|
@ -488,9 +488,9 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
|
||||
break;
|
||||
case 's': {
|
||||
static const struct suffix_mult km_suffixes[] = {
|
||||
{ "k", 1024 },
|
||||
{ "m", 1024*1024 },
|
||||
{ NULL, 0 }
|
||||
{ "k", 1024 },
|
||||
{ "m", 1024*1024 },
|
||||
{ }
|
||||
};
|
||||
ld->sizemax = xatou_sfx(&s[1], km_suffixes);
|
||||
break;
|
||||
@ -503,10 +503,10 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
|
||||
break;
|
||||
case 't': {
|
||||
static const struct suffix_mult mh_suffixes[] = {
|
||||
{ "m", 60 },
|
||||
{ "h", 60*60 },
|
||||
/*{ "d", 24*60*60 },*/
|
||||
{ NULL, 0 }
|
||||
{ "m", 60 },
|
||||
{ "h", 60*60 },
|
||||
/*{ "d", 24*60*60 },*/
|
||||
{ }
|
||||
};
|
||||
ld->tmax = xatou_sfx(&s[1], mh_suffixes);
|
||||
if (ld->tmax) {
|
||||
|
@ -48,10 +48,10 @@ static const char add_first[] = "\"%07.7_Ax\n\"";
|
||||
static const char hexdump_opts[] = "bcdoxCe:f:n:s:v";
|
||||
|
||||
static const struct suffix_mult suffixes[] = {
|
||||
{ "b", 512 },
|
||||
{ "k", 1024 },
|
||||
{ "m", 1024*1024 },
|
||||
{ NULL, 0 }
|
||||
{ "b", 512 },
|
||||
{ "k", 1024 },
|
||||
{ "m", 1024*1024 },
|
||||
{ }
|
||||
};
|
||||
|
||||
int hexdump_main(int argc, char **argv);
|
||||
|
Loading…
Reference in New Issue
Block a user