From 20a399822282522aee8a390bb1a8d85166dd1ea1 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Tue, 15 May 2012 17:45:17 +0200
Subject: sys-utils: cleanup strtoxx_or_err()

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 sys-utils/cytune.c   | 15 +++++----------
 sys-utils/dmesg.c    |  3 +--
 sys-utils/ipcmk.c    |  4 ++--
 sys-utils/ipcrm.c    |  6 +++---
 sys-utils/ldattach.c |  6 +++---
 sys-utils/losetup.c  |  2 +-
 sys-utils/mount.c    |  2 +-
 sys-utils/prlimit.c  |  2 +-
 sys-utils/rtcwake.c  |  6 ++----
 9 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/sys-utils/cytune.c b/sys-utils/cytune.c
index ecacff2a1..407d4f703 100644
--- 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 e47b08705..854990361 100644
--- 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 6919d0dea..e7c5f5865 100644
--- 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 b452b51ec..7807bd437 100644
--- 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 2917d4e83..551a505cd 100644
--- 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 7059d2f89..17838d842 100644
--- 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 e5d7a4fc0..af9178487 100644
--- 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 7e52a2d9c..58e189c1f 100644
--- 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 4ae2cef29..321f8d5f3 100644
--- 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':
-- 
cgit v1.2.3-55-g7522