sys-utils: cleanup strtoxx_or_err()

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/sys-utils/cytune.c b/sys-utils/cytune.c
index ecacff2a1a28c0b955bd5fe61c9a3f00793f5822..407d4f703646f201086c83e327a6830b3556ad77 100644 (file)
--- a/sys-utils/cytune.c
+++ b/sys-utils/cytune.c
@@ -322,8 +322,7 @@ int main(int argc, char **argv)
                        query = 1;
                        break;
                case 'i':
-                       interval =
-                           (int)strtoul_or_err(optarg,
+                       interval = strtou32_or_err(optarg,
                                                _("Invalid interval value"));
                        if (interval < 1) {
                                warnx(_("Invalid interval value: %d"),
@@ -333,8 +332,7 @@ int main(int argc, char **argv)
                        break;
                case 's':
                        ++set;
-                       set_val =
-                           (int)strtoul_or_err(optarg, _("Invalid set value"));
+                       set_val = strtou32_or_err(optarg, _("Invalid set value"));
                        if (set_val < 1 || 12 < set_val) {
                                warnx(_("Invalid set value: %d"), set_val);
                                errflg++;
@@ -342,8 +340,7 @@ int main(int argc, char **argv)
                        break;
                case 'S':
                        ++set_def;
-                       set_def_val =
-                           (int)strtoul_or_err(optarg,
+                       set_def_val = strtou32_or_err(optarg,
                                                _("Invalid default value"));
                        if (set_def_val < 0 || 12 < set_def_val) {
                                warnx(_("Invalid default value: %d"),
@@ -353,8 +350,7 @@ int main(int argc, char **argv)
                        break;
                case 't':
                        ++set_time;
-                       set_time_val =
-                           (int)strtoul_or_err(optarg,
+                       set_time_val = strtou32_or_err(optarg,
                                                _("Invalid set time value"));
                        if (set_time_val < 1 || 255 < set_time_val) {
                                warnx(_("Invalid set time value: %d"),
@@ -364,8 +360,7 @@ int main(int argc, char **argv)
                        break;
                case 'T':
                        ++set_def_time;
-                       set_def_time_val =
-                           (int)strtoul_or_err(optarg,
+                       set_def_time_val = strtou32_or_err(optarg,
                                                _("Invalid default time value"));
                        if (set_def_time_val < 0 || 255 < set_def_time_val) {
                                warnx(_("Invalid default time value: %d"),

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index e47b08705a6490da311e2b26d2dd75ee54b65077..8549903617912aafcd89ca49cb0909755fe3971c 100644 (file)
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -745,8 +745,7 @@ int main(int argc, char *argv[])
                        ctl.raw = 1;
                        break;
                case 's':
-                       bufsize = strtol_or_err(optarg,
-                                       _("failed to parse buffer size"));
+                       bufsize = strtou32_or_err(optarg, _("invalid buffer size argument"));
                        if (bufsize < 4096)
                                bufsize = 4096;
                        break;

diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c
index 6919d0deadc26defd90be35395d1a0a8ab878fee..e7c5f5865fab20e19713c3f978bc95652aa83319 100644 (file)
--- a/sys-utils/ipcmk.c
+++ b/sys-utils/ipcmk.c
@@ -104,14 +104,14 @@ int main(int argc, char **argv)
        while((opt = getopt_long(argc, argv, "hM:QS:p:Vh", longopts, NULL)) != -1) {
                switch(opt) {
                case 'M':
-                       size = strtol_or_err(optarg, _("failed to parse size"));
+                       size = strtou64_or_err(optarg, _("failed to parse size"));
                        ask_shm = 1;
                        break;
                case 'Q':
                        ask_msg = 1;
                        break;
                case 'S':
-                       nsems = strtol_or_err(optarg, _("failed to parse elements"));
+                       nsems = strtos32_or_err(optarg, _("failed to parse elements"));
                        ask_sem = 1;
                        break;
                case 'p':

diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c
index b452b51ec1fcc9e3ddb4dbd441307cda6997b7bd..7807bd437273e7943b001f20d17d54486f4754d6 100644 (file)
--- a/sys-utils/ipcrm.c
+++ b/sys-utils/ipcrm.c
@@ -337,7 +337,7 @@ int main(int argc, char **argv)
                        }
                case 'm':
                        if (!iskey)
-                               id = strtoll_or_err(optarg, _("failed to parse argument"));
+                               id = strtos32_or_err(optarg, _("failed to parse argument"));
                        if (remove_id(SHM, iskey, id))
                                ret++;
                        break;
@@ -350,7 +350,7 @@ int main(int argc, char **argv)
                        }
                case 'q':
                        if (!iskey)
-                               id = strtoll_or_err(optarg, _("failed to parse argument"));
+                               id = strtos32_or_err(optarg, _("failed to parse argument"));
                        if (remove_id(MSG, iskey, id))
                                ret++;
                        break;
@@ -363,7 +363,7 @@ int main(int argc, char **argv)
                        }
                case 's':
                        if (!iskey)
-                               id = strtoll_or_err(optarg, _("failed to parse argument"));
+                               id = strtos32_or_err(optarg, _("failed to parse argument"));
                        if (remove_id(SEM, iskey, id))
                                ret++;
                        break;

diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index 2917d4e833b1e4fbc4645afabd98f827c6604a9d..551a505cd96feff19ee8b53decd752583c40eada 100644 (file)
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -141,7 +141,7 @@ static int parse_iflag(char *str, int *set_iflag, int *clr_iflag)
                if (*s == '-')
                        s++;
                if ((iflag = lookup_table(ld_iflags, s)) < 0)
-                       iflag = strtol_or_err(s, _("invalid iflag"));
+                       iflag = strtos32_or_err(s, _("invalid iflag"));
                if (s > str && *(s - 1) == '-')
                        *clr_iflag |= iflag;
                else
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
                        parity = optc;
                        break;
                case 's':
-                       speed = strtol_or_err(optarg, _("invalid speed"));
+                       speed = strtos32_or_err(optarg, _("invalid speed argument"));
                        break;
                case 'i':
                        parse_iflag(optarg, &set_iflag, &clr_iflag);
@@ -285,7 +285,7 @@ int main(int argc, char **argv)
        /* parse line discipline specification */
        ldisc = lookup_table(ld_discs, argv[optind]);
        if (ldisc < 0)
-               ldisc = strtol_or_err(argv[optind], _("invalid line discipline"));
+               ldisc = strtos32_or_err(argv[optind], _("invalid line discipline argument"));
 
        /* open device */
        dev = argv[optind + 1];

diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 7059d2f8966ad8a436d02f0aaab5e129a9a07672..17838d84216a8ca3717a7e3d1ff90449541874d2 100644 (file)
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
                        flags |= LOOPDEV_FL_OFFSET;
                        break;
                case 'p':
-                       passfd = strtol_or_err(optarg,
+                       passfd = strtou32_or_err(optarg,
                                        _("invalid passphrase file descriptor"));
                        break;
                case 'P':

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index e5d7a4fc05b81edc810209db44db1fec4988be72..af9178487942b229ec157dd1ef8d9fc168c6d29e 100644 (file)
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -766,7 +766,7 @@ int main(int argc, char **argv)
                                err(MOUNT_EX_SYSERR, _("failed to set options pattern"));
                        break;
                case 'p':
-                       passfd = strtol_or_err(optarg,
+                       passfd = strtou32_or_err(optarg,
                                        _("invalid passphrase file descriptor"));
                        break;
                case 'L':

diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index 7e52a2d9c725c2c96fd0135ef2ba58d5a14975b3..58e189c1f220d4945a2c3950ab4ca0634c2dd336 100644 (file)
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -581,7 +581,7 @@ int main(int argc, char **argv)
                        if (pid) /* we only work one pid at a time */
                                errx(EXIT_FAILURE, _("only use one PID at a time"));
 
-                       pid = strtol_or_err(optarg, _("cannot parse PID"));
+                       pid = strtos32_or_err(optarg, _("invalid PID argument"));
                        break;
                case 'h':
                        usage(stdout);

diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 4ae2cef296f01656e842333d2a293f9a2b6028eb..321f8d5f33be29acc806e78b77570de7cd221c2a 100644 (file)
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -445,16 +445,14 @@ int main(int argc, char **argv)
 
                        /* alarm time, seconds-to-sleep (relative) */
                case 's':
-                       seconds = strtol_or_err(optarg,
-                                       _("failed to parse seconds value"));
+                       seconds = strtou32_or_err(optarg, _("invalid seconds argument"));
                        break;
 
                        /* alarm time, time_t (absolute, seconds since
                         * 1/1 1970 UTC)
                         */
                case 't':
-                       alarm = strtol_or_err(optarg,
-                                       _("failed to parse time_t value"));
+                       alarm = strtou32_or_err(optarg, _("invalid time argument"));
                        break;
 
                case 'u':