[PATCH 02/15] cytune: remove unnecessary variables

[Sami Kerola <kerolasa@xxxxxx>]

Exit immediately at error.

Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
 sys-utils/cytune.c | 46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/sys-utils/cytune.c b/sys-utils/cytune.c
index 544865f..64e15cc 100644
--- a/sys-utils/cytune.c
+++ b/sys-utils/cytune.c
@@ -274,9 +274,7 @@ int main(int argc, char **argv)
 {
 	int query = 0;
 	int interval = 1;
-	int errflg = 0;
 	int file;
-	int numfiles;
 	int i;
 
 	int get_current = 0;
@@ -327,49 +325,39 @@ int main(int argc, char **argv)
 		case 'i':
 			interval = strtou32_or_err(optarg,
 						_("Invalid interval value"));
-			if (interval < 1) {
-				warnx(_("Invalid interval value: %d"),
-				      interval);
-				errflg++;
-			}
+			if (interval < 1)
+				errx(EXIT_FAILURE, _("Invalid interval value: %d"),
+						     interval);
 			break;
 		case 's':
 			++set_threshold;
 			threshold_val = strtou32_or_err(optarg, _("Invalid threshold value"));
-			if (threshold_val < 1 || 12 < threshold_val) {
-				warnx(_("Invalid threshold value: %d"), threshold_val);
-				errflg++;
-			}
+			if (threshold_val < 1 || 12 < threshold_val)
+				errx(EXIT_FAILURE, _("Invalid threshold value: %d"), threshold_val);
 			break;
 		case 'S':
 			++set_threshold_def;
 			threshold_def_val = strtou32_or_err(optarg,
 						_("Invalid threshold default value"));
-			if (threshold_def_val < 0 || 12 < threshold_def_val) {
-				warnx(_("Invalid threshold default value: %d"),
-				      threshold_def_val);
-				errflg++;
-			}
+			if (threshold_def_val < 0 || 12 < threshold_def_val)
+				errx(EXIT_FAILURE, ("Invalid threshold default value: %d"),
+						    threshold_def_val);
 			break;
 		case 't':
 			++set_timeout;
 			timeout_val = strtou32_or_err(optarg,
 						_("Invalid set timeout value"));
-			if (timeout_val < 1 || 255 < timeout_val) {
-				warnx(_("Invalid set timeout value: %d"),
-				      timeout_val);
-				errflg++;
-			}
+			if (timeout_val < 1 || 255 < timeout_val)
+				errx(EXIT_FAILURE, _("Invalid set timeout value: %d"),
+						     timeout_val);
 			break;
 		case 'T':
 			++set_threshold_def;
 			timeout_def_val = strtou32_or_err(optarg,
 						_("Invalid default timeout value"));
-			if (timeout_def_val < 0 || 255 < timeout_def_val) {
-				warnx(_("Invalid default time value: %d"),
-				      timeout_def_val);
-				errflg++;
-			}
+			if (timeout_def_val < 0 || 255 < timeout_def_val)
+				errx(EXIT_FAILURE, _("Invalid default time value: %d"),
+						     timeout_def_val);
 			break;
 		case 'g':
 			++get_current;
@@ -387,10 +375,8 @@ int main(int argc, char **argv)
 			usage(stderr);
 		}
 	}
-	numfiles = argc - optind;
 
-	if (errflg
-	    || (numfiles == 0)
+	if (argc - optind == 0
 	    || (!query && !set_threshold && !set_threshold_def && !get_defaults && !get_current && !set_timeout && !set_timeout_def)
 	    || (set_threshold && set_threshold_def)
 	    || (set_timeout && set_timeout_def)
@@ -458,7 +444,7 @@ int main(int argc, char **argv)
 	if (!query)
 		return EXIT_SUCCESS;
 
-	query_tty_stats(argc, argv, interval, numfiles, &threshold_value, &timeout_value);
+	query_tty_stats(argc, argv, interval, argc - optind, &threshold_value, &timeout_value);
 
 	return EXIT_SUCCESS;
 }
-- 
1.9.2

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html