ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tunelp: remove get_val() in favour of strtol_or_err() 

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2015-02-22 14:41:35 +00:00 committed by Karel Zak
parent 288cb6f5dd
commit 7e3c80a7b6
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys-utils/Makemodule.am
View File

@ -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

22
sys-utils/tunelp.c
View File

@ -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;