diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-27 15:30:39 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-27 15:30:39 +0000 |
| commit | 1bab1de69866c38c3e9924d23f21a90623a0a6dc (patch) | |
| tree | cabe111142bea9de4c2ca0de3ad8a9ccd7e242e5 | |
| parent | f868963c672ffdfc4bd37670b8d74342577264b1 (diff) | |
fix for suffix optimization (which was in previous commit)
| -rw-r--r-- | include/libbb.h | 1 | ||||
| -rw-r--r-- | libbb/xatonum_template.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index 780bd4566..ddbde1833 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -450,6 +450,7 @@ const char *make_human_readable_str(unsigned long long size, /* Put a string of hex bytes ("1b2e66fe"...), return advanced pointer */ char *bin2hex(char *buf, const char *cp, int count); +/* Last element is marked by mult == 0 */ struct suffix_mult { char suffix[4]; unsigned mult; diff --git a/libbb/xatonum_template.c b/libbb/xatonum_template.c index bc8116056..205da53c8 100644 --- a/libbb/xatonum_template.c +++ b/libbb/xatonum_template.c @@ -45,7 +45,7 @@ unsigned type xstrtou(_range_sfx)(const char *numstr, int base, * Note that we also allow nul suffixes with associated multipliers, * to allow for scaling of the numstr by some default multiplier. */ if (suffixes) { - while (suffixes->suffix) { + while (suffixes->mult) { if (strcmp(suffixes->suffix, e) == 0) { if (XSTR_UTYPE_MAX / suffixes->mult < r) goto range; /* overflow! */ |