From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 02/15] cytune: remove unnecessary variables
Date: Sun, 4 May 2014 16:49:43 +0100 [thread overview]
Message-ID: <1399218596-21321-3-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1399218596-21321-1-git-send-email-kerolasa@iki.fi>
Exit immediately at error.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
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
next prev parent reply other threads:[~2014-05-04 15:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-04 15:49 [PATCH 00/15] cytune modernization Sami Kerola
2014-05-04 15:49 ` [PATCH 01/15] cytune: rename threshold and timeout variables Sami Kerola
2014-05-05 8:34 ` Benno Schulenberg
2014-05-04 15:49 ` Sami Kerola [this message]
2014-05-05 8:29 ` [PATCH 02/15] cytune: remove unnecessary variables Benno Schulenberg
2014-05-04 15:49 ` [PATCH 03/15] cytune: be consistent with interval data type Sami Kerola
2014-05-04 15:49 ` [PATCH 04/15] cytune: use single loop for setting and getting ioctl() calls Sami Kerola
2014-05-05 8:24 ` Benno Schulenberg
2014-05-04 15:49 ` [PATCH 05/15] cytune: kernel still does not have send_count in cyclades_monitor structure Sami Kerola
2014-05-04 15:49 ` [PATCH 06/15] cytune: prefer sigaction(), and remove unnecessary abstractions Sami Kerola
2014-05-04 15:49 ` [PATCH 07/15] cytune: add cyg_get_mon() to avoid duplicate code Sami Kerola
2014-05-04 15:49 ` [PATCH 08/15] cytune: add structure to hold run time configuration Sami Kerola
2014-05-04 15:49 ` [PATCH 09/15] cytune: pull signal handling and statistic priting apart Sami Kerola
2014-05-04 15:49 ` [PATCH 10/15] cytune: remove unnecessary type casts Sami Kerola
2014-05-04 15:49 ` [PATCH 11/15] cytune: deprecate undescriptive options Sami Kerola
2014-05-04 15:49 ` [PATCH 12/15] cytune: add filename to struct cyclades_control Sami Kerola
2014-05-04 15:49 ` [PATCH 13/15] cytune: add noreturn function attributes Sami Kerola
2014-05-04 15:49 ` [PATCH 14/15] cytune: use matching type in struct cyclades_control with kernel Sami Kerola
2014-05-04 15:49 ` [PATCH 15/15] cytune: update copyright Sami Kerola
2014-05-07 7:10 ` [PATCH 00/15] cytune modernization Karel Zak
2014-05-07 8:12 ` Sami Kerola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399218596-21321-3-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox