From 5f38375100dd1001c60b31aeb519d15b3b342d1b Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 16 Mar 2015 12:01:55 -0400 Subject: command-line: add ovs_cmdl_ prefix The coding style guidelines include the following: - Pick a unique name prefix (ending with an underscore) for each module, and apply that prefix to all of that module's externally visible names. Names of macro parameters, struct and union members, and parameters in function prototypes are not considered externally visible for this purpose. This patch adds the new prefix to the externally visible names. This makes it a bit more obvious what code is coming from common command line handling code. Signed-off-by: Russell Bryant Signed-off-by: Ben Pfaff --- tests/test-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/test-util.c') diff --git a/tests/test-util.c b/tests/test-util.c index 2c985e71c..01a1a7829 100644 --- a/tests/test-util.c +++ b/tests/test-util.c @@ -1049,7 +1049,7 @@ test_file_name(int argc, char *argv[]) } #endif /* _WIN32 */ -static const struct command commands[] = { +static const struct ovs_cmdl_command commands[] = { {"ctz", NULL, 0, 0, test_ctz}, {"clz", NULL, 0, 0, test_clz}, {"round_up_pow2", NULL, 0, 0, test_round_up_pow2}, @@ -1080,7 +1080,7 @@ parse_options(int argc, char *argv[]) VLOG_LONG_OPTIONS, {NULL, 0, NULL, 0}, }; - char *short_options = long_options_to_short_options(long_options); + char *short_options = ovs_cmdl_long_options_to_short_options(long_options); for (;;) { int c = getopt_long(argc, argv, short_options, long_options, NULL); @@ -1111,7 +1111,7 @@ test_util_main(int argc, char *argv[]) * POSIX doesn't define the circumstances in which stderr is * fully buffered either. */ setvbuf(stderr, NULL, _IONBF, 0); - run_command(argc - optind, argv + optind, commands); + ovs_cmdl_run_command(argc - optind, argv + optind, commands); } OVSTEST_REGISTER("test-util", test_util_main); -- cgit v1.2.1