safe_strtoXX interface proved to be a bit unconvenient.

Remove it, introduce saner bb_strtoXX.
Saved ~350 bytes.


git-svn-id: svn://busybox.net/trunk/busybox@16684 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 4 insertions, 2 deletions

diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index 829d7e960..5e399e1f8 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -64,7 +64,8 @@ static int read_str(const char *line, void *arg)
 
 static int read_u32(const char *line, void *arg)
 {
-        return safe_strtou32(line, (uint32_t*)arg) == 0;
+        *((uint32_t*)arg) = bb_strtou32(line, NULL, 10);
+        return errno == 0;
 }
 
 
@@ -101,7 +102,8 @@ static void attach_option(struct option_set **opt_list,
         struct option_set *existing, *new, **curr;
 
         /* add it to an existing option */
-        if ((existing = find_option(*opt_list, option->code))) {
+        existing = find_option(*opt_list, option->code);
+        if (existing) {
                 DEBUG("Attaching option %s to existing member of list", option->name);
                 if (option->flags & OPTION_LIST) {
                         if (existing->data[OPT_LEN] + length <= 255) {