diff options
author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-05-27 22:52:57 -0700 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-28 10:18:14 +0200 |
commit | faf2ad1dc5a1a3fb131559c26675cecdd20b74a8 (patch) | |
tree | 037a0f2deb846207d0db6468e2d85338211c8ee0 | |
parent | 8f945131a18e68121f6e7ea4c12992a5eb108466 (diff) | |
download | barebox-faf2ad1dc5a1a3fb131559c26675cecdd20b74a8.tar.gz barebox-faf2ad1dc5a1a3fb131559c26675cecdd20b74a8.tar.xz |
libbb: Drop simple_itoa()
Hush is the only one user of simple_itoa() and the code there can be
re-implemented using snprintf(). Change the code to get rid of
simple_itoa().
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | common/hush.c | 7 | ||||
-rw-r--r-- | include/libbb.h | 2 | ||||
-rw-r--r-- | lib/libbb.c | 14 |
3 files changed, 6 insertions, 17 deletions
diff --git a/common/hush.c b/common/hush.c index dab9b04081..68c3eccdfc 100644 --- a/common/hush.c +++ b/common/hush.c @@ -402,7 +402,12 @@ static void b_free(o_string *o) static int b_adduint(o_string *o, unsigned int i) { int r; - char *p = simple_itoa(i); + /* 21 digits plus null terminator, good for 64-bit or smaller + * ints */ + char number[22]; + char *p = number; + + snprintf(number, sizeof(number), "%u", i); /* no escape checking necessary */ do { diff --git a/include/libbb.h b/include/libbb.h index 1f6afaa27a..d05c190637 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -29,6 +29,4 @@ char * safe_strncpy(char *dst, const char *src, size_t size); int process_escape_sequence(const char *source, char *dest, int destlen); -char *simple_itoa(unsigned int i); - #endif /* __LIBBB_H */ diff --git a/lib/libbb.c b/lib/libbb.c index 239611c27b..d0c9bf4d80 100644 --- a/lib/libbb.c +++ b/lib/libbb.c @@ -112,17 +112,3 @@ char * safe_strncpy(char *dst, const char *src, size_t size) return strncpy(dst, src, size); } EXPORT_SYMBOL(safe_strncpy); - -char *simple_itoa(unsigned int i) -{ - /* 21 digits plus null terminator, good for 64-bit or smaller ints */ - static char local[22]; - char *p = &local[21]; - *p-- = '\0'; - do { - *p-- = '0' + i % 10; - i /= 10; - } while (i > 0); - return p + 1; -} -EXPORT_SYMBOL(simple_itoa); |