Date: Sun, 3 Jan 2010 16:31:33 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 172523 for review Message-ID: <201001031631.o03GVXMf099016@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=172523 Change 172523 by hselasky@hselasky_laptop001 on 2010/01/03 16:30:36 usbconfig: - be more verbose on duplicate options. - patch by: HPS Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#18 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#18 (text+ko) ==== @@ -253,6 +253,14 @@ } static void +duplicate_option(const char *ptr) +{ + printf("Syntax error: " + "Duplicate option: '%s'\n", ptr); + exit(1); +} + +static void usage(void) { printf("" @@ -601,14 +609,14 @@ case T_DUMP_QUIRK_NAMES: if (opt->got_dump_quirk_names) - break; + duplicate_option(argv[n]); opt->got_dump_quirk_names = 1; opt->got_any++; break; case T_DUMP_DEVICE_QUIRKS: if (opt->got_dump_device_quirks) - break; + duplicate_option(argv[n]); opt->got_dump_device_quirks = 1; opt->got_any++; break; @@ -638,7 +646,7 @@ break; case T_SET_CONFIG: if (opt->got_set_config) - break; + duplicate_option(argv[n]); opt->config_index = num_id(argv[n + 1], "cfg_index"); opt->got_set_config = 1; opt->got_any++; @@ -646,7 +654,7 @@ break; case T_SET_ALT: if (opt->got_set_alt) - break; + duplicate_option(argv[n]); opt->alt_index = num_id(argv[n + 1], "cfg_index"); opt->got_set_alt = 1; opt->got_any++; @@ -654,7 +662,7 @@ break; case T_SET_TEMPLATE: if (opt->got_set_template) - break; + duplicate_option(argv[n]); opt->template = get_int(argv[n + 1]); opt->got_set_template = 1; opt->got_any++; @@ -662,31 +670,31 @@ break; case T_GET_TEMPLATE: if (opt->got_get_template) - break; + duplicate_option(argv[n]); opt->got_get_template = 1; opt->got_any++; break; case T_DUMP_DEVICE_DESC: if (opt->got_dump_device_desc) - break; + duplicate_option(argv[n]); opt->got_dump_device_desc = 1; opt->got_any++; break; case T_DUMP_CURR_CONFIG_DESC: if (opt->got_dump_curr_config) - break; + duplicate_option(argv[n]); opt->got_dump_curr_config = 1; opt->got_any++; break; case T_DUMP_ALL_CONFIG_DESC: if (opt->got_dump_all_config) - break; + duplicate_option(argv[n]); opt->got_dump_all_config = 1; opt->got_any++; break; case T_DUMP_INFO: if (opt->got_dump_info) - break; + duplicate_option(argv[n]); opt->got_dump_info = 1; opt->got_any++; break; @@ -701,43 +709,43 @@ break; case T_SUSPEND: if (opt->got_suspend) - break; + duplicate_option(argv[n]); opt->got_suspend = 1; opt->got_any++; break; case T_RESUME: if (opt->got_resume) - break; + duplicate_option(argv[n]); opt->got_resume = 1; opt->got_any++; break; case T_POWER_OFF: if (opt->got_power_off) - break; + duplicate_option(argv[n]); opt->got_power_off = 1; opt->got_any++; break; case T_POWER_SAVE: if (opt->got_power_save) - break; + duplicate_option(argv[n]); opt->got_power_save = 1; opt->got_any++; break; case T_POWER_ON: if (opt->got_power_on) - break; + duplicate_option(argv[n]); opt->got_power_on = 1; opt->got_any++; break; case T_RESET: if (opt->got_reset) - break; + duplicate_option(argv[n]); opt->got_reset = 1; opt->got_any++; break; case T_LIST: if (opt->got_list) - break; + duplicate_option(argv[n]); opt->got_list = 1; opt->got_any++; break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001031631.o03GVXMf099016>