From cd8144aec736d08ba021d0d010983368998b6d88 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sat, 14 Apr 2012 19:38:26 -0700 Subject: [PATCH] small refactor --- args.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/args.h b/args.h index 484b988..9c8a693 100644 --- a/args.h +++ b/args.h @@ -97,6 +97,20 @@ void args_print_help() exit(0); } +static void args_check_bounds() +{ + if (args_current >= args_argc) { + if (args_current - 1 == args_previous) + fprintf(stderr, "%s requires an argument.\n", + args_previous_name); + else + fprintf(stderr, "%s requires another argument.\n", + args_previous_name); + args_print_usage(); + exit(1); + } +} + static int args_get_index(char* name) { int i; @@ -114,20 +128,11 @@ static int args_get_index(char* name) static char* args__poll(char wants_switch) { - static char short_[3] = "-\0"; + static char short_[3] = "--"; static int pos = 0; char* arg = NULL; - if (args_current >= args_argc) { - if (args_current - 1 == args_previous) - fprintf(stderr, "%s requires an argument.\n", - args_previous_name); - else - fprintf(stderr, "%s requires another argument.\n", - args_previous_name); - args_print_usage(); - exit(1); - } + args_check_bounds(); arg = args_argv[args_current]; if (!wants_switch) {