diff options
| author | Sami Kerola <kerolasa@iki.fi> | 2015-02-22 14:41:35 +0000 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2015-02-24 11:28:55 +0100 |
| commit | 7e3c80a7b6d652cf45fbfe2431cb24de74c72185 (patch) | |
| tree | 3d6fdba780e3b940ba920fb8b1ce58f103314150 | |
| parent | 288cb6f5dd72e4f4fe7dfb45015eaca6d7317995 (diff) | |
| download | util-linux-playground-7e3c80a7b6d652cf45fbfe2431cb24de74c72185.tar.gz | |
tunelp: remove get_val() in favour of strtol_or_err()
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| -rw-r--r-- | sys-utils/Makemodule.am | 1 | ||||
| -rw-r--r-- | sys-utils/tunelp.c | 22 |
2 files changed, 9 insertions, 14 deletions
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 15d0a95073..23b8f5c0cf 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -50,6 +50,7 @@ if BUILD_TUNELP usrsbin_exec_PROGRAMS += tunelp dist_man_MANS += sys-utils/tunelp.8 tunelp_SOURCES = sys-utils/tunelp.c sys-utils/lp.h +tunelp_LDADD = $(LDADD) libcommon.la endif if BUILD_FSTRIM diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c index b132d7aafa..197b09359e 100644 --- a/sys-utils/tunelp.c +++ b/sys-utils/tunelp.c @@ -74,8 +74,10 @@ #include "xalloc.h" #include "closestream.h" -#define EXIT_BAD_VALUE 3 -#define EXIT_LP_IO_ERR 4 +#define STRTOXX_EXIT_CODE 3 +#define EXIT_LP_IO_ERR 4 + +#include "strutils.h" struct command { long op; @@ -114,14 +116,6 @@ static void __attribute__((__noreturn__)) print_usage(FILE *out) exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } -static long get_val(char *val) -{ - long ret; - if (!(sscanf(val, "%ld", &ret) == 1)) - errx(EXIT_BAD_VALUE, _("bad value")); - return ret; -} - static long get_onoff(char *val) { if (!strncasecmp("on", val, 2)) @@ -171,28 +165,28 @@ int main(int argc, char **argv) break; case 'i': cmds->op = LPSETIRQ; - cmds->val = get_val(optarg); + cmds->val = strtol_or_err(optarg, _("argument error")); cmds->next = xmalloc(sizeof(struct command)); cmds = cmds->next; cmds->next = 0; break; case 't': cmds->op = LPTIME; - cmds->val = get_val(optarg); + cmds->val = strtol_or_err(optarg, _("argument error")); cmds->next = xmalloc(sizeof(struct command)); cmds = cmds->next; cmds->next = 0; break; case 'c': cmds->op = LPCHAR; - cmds->val = get_val(optarg); + cmds->val = strtol_or_err(optarg, _("argument error")); cmds->next = xmalloc(sizeof(struct command)); cmds = cmds->next; cmds->next = 0; break; case 'w': cmds->op = LPWAIT; - cmds->val = get_val(optarg); + cmds->val = strtol_or_err(optarg, _("argument error")); cmds->next = xmalloc(sizeof(struct command)); cmds = cmds->next; cmds->next = 0; |