aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-12 21:31:16 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-12 21:31:16 +0000
commit5755b09a25b0e4e0e24baf1897cabc59498541ea (patch)
tree1aeca0400e9765268ce4e951aa56e094f91b7d67 /libbb
parent5188b261f9e930e2a3330b385d04f3df4dab5101 (diff)
downloadbusybox-w32-5755b09a25b0e4e0e24baf1897cabc59498541ea.tar.gz
busybox-w32-5755b09a25b0e4e0e24baf1897cabc59498541ea.tar.bz2
busybox-w32-5755b09a25b0e4e0e24baf1897cabc59498541ea.zip
More minor tweaks.
git-svn-id: svn://busybox.net/trunk/busybox@15689 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r--libbb/xgetlarg.c10
-rw-r--r--libbb/xgetularg.c2
2 files changed, 2 insertions, 10 deletions
diff --git a/libbb/xgetlarg.c b/libbb/xgetlarg.c
index cadb83e08..5b1e7b9d5 100644
--- a/libbb/xgetlarg.c
+++ b/libbb/xgetlarg.c
@@ -20,14 +20,8 @@ long bb_xgetlarg(const char *arg, int base, long lower, long upper)
20 char *endptr; 20 char *endptr;
21 int errno_save = errno; 21 int errno_save = errno;
22 22
23 assert(arg!=NULL); 23 if (ENABLE_DEBUG && arg==NULL)
24 24 bb_error_msg_and_die("Null in xgetlarg.");
25 /* Don't allow leading whitespace.
26 * Wrap isspace in () to make sure we call the
27 * function rather than the macro. */
28 if ((isspace)(*arg)) {
29 bb_show_usage();
30 }
31 25
32 errno = 0; 26 errno = 0;
33 result = strtol(arg, &endptr, base); 27 result = strtol(arg, &endptr, base);
diff --git a/libbb/xgetularg.c b/libbb/xgetularg.c
index 6110746a5..21b0d12f7 100644
--- a/libbb/xgetularg.c
+++ b/libbb/xgetularg.c
@@ -89,9 +89,7 @@ long bb_xgetlarg_bnd_sfx(const char *arg, int base,
89 89
90 if ((*p == '-') && (p[1] != '+')) { 90 if ((*p == '-') && (p[1] != '+')) {
91 ++p; 91 ++p;
92#if LONG_MAX == (-(LONG_MIN + 1))
93 ++u; /* two's complement */ 92 ++u; /* two's complement */
94#endif
95 } 93 }
96 94
97 r = bb_xgetularg_bnd_sfx(p, base, 0, u, suffixes); 95 r = bb_xgetularg_bnd_sfx(p, base, 0, u, suffixes);