From 95519caff2dc39ce3a8f3dc2d9d7f4512c7f9d12 Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Mon, 26 Mar 2012 10:05:45 +0200 Subject: [PATCH] merge code for slot 1 and 2 --- ykpers-args.c | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/ykpers-args.c b/ykpers-args.c index 6617de2..85ad4ae 100644 --- a/ykpers-args.c +++ b/ykpers-args.c @@ -241,35 +241,26 @@ int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, switch (c) { case '1': - if (slot_chosen) { - fprintf(stderr, "You may only choose slot (-1 / -2) once.\n"); - *exit_code = 1; - return 0; - } - if (option_seen) { - fprintf(stderr, "You must choose slot before any options (-o).\n"); - *exit_code = 1; - return 0; - } - if (!ykp_configure_for(cfg, 1, st)) - return 0; - slot_chosen = true; - break; - case '2': - if (slot_chosen) { - fprintf(stderr, "You may only choose slot (-1 / -2) once.\n"); - *exit_code = 1; - return 0; - } - if (option_seen) { - fprintf(stderr, "You must choose slot before any options (-o).\n"); - *exit_code = 1; - return 0; + case '2': { + int slot = 1; + if(c == '2') { + slot = 2; + } + if (slot_chosen) { + fprintf(stderr, "You may only choose slot (-1 / -2) once.\n"); + *exit_code = 1; + return 0; + } + if (option_seen) { + fprintf(stderr, "You must choose slot before any options (-o).\n"); + *exit_code = 1; + return 0; + } + if (!ykp_configure_for(cfg, slot, st)) + return 0; + slot_chosen = true; + break; } - if (!ykp_configure_for(cfg, 2, st)) - return 0; - slot_chosen = true; - break; case 'i': *infname = optarg; break; -- 2.39.5