Kouhei Sutou
null+****@clear*****
Wed Dec 10 23:55:43 JST 2014
Kouhei Sutou 2014-12-10 23:55:43 +0900 (Wed, 10 Dec 2014) New Revision: e119b1baabae1661fdec5b0b82dd918cfc6376ef https://github.com/groonga/groonga/commit/e119b1baabae1661fdec5b0b82dd918cfc6376ef Message: groonga: use ACTION_ prefix for action related flags Modified files: src/groonga.c Modified: src/groonga.c (+16 -16) =================================================================== --- src/groonga.c 2014-12-10 23:53:28 +0900 (3f5c7d1) +++ src/groonga.c 2014-12-10 23:55:43 +0900 (dde3f5b) @@ -1923,13 +1923,13 @@ g_server(char *path) } enum { - MODE_USAGE = 1, - MODE_VERSION, - MODE_CONFIG, - MODE_ERROR + ACTION_USAGE = 1, + ACTION_VERSION, + ACTION_CONFIG, + ACTION_ERROR }; -#define MODE_MASK (0x0f) +#define ACTION_MASK (0x0f) #define MODE_ALONE (1 << 4) #define MODE_CLIENT (1 << 5) #define MODE_DAEMON (1 << 6) @@ -2445,7 +2445,7 @@ main(int argc, char **argv) {'p', "port", NULL, 0, GETOPT_OP_NONE}, {'e', "encoding", NULL, 0, GETOPT_OP_NONE}, {'t', "max-threads", NULL, 0, GETOPT_OP_NONE}, - {'h', "help", NULL, MODE_USAGE, GETOPT_OP_UPDATE}, + {'h', "help", NULL, ACTION_USAGE, GETOPT_OP_UPDATE}, {'c', NULL, NULL, MODE_CLIENT, GETOPT_OP_ON}, {'d', NULL, NULL, MODE_DAEMON, GETOPT_OP_ON}, {'s', NULL, NULL, MODE_SERVER, GETOPT_OP_ON}, @@ -2453,12 +2453,12 @@ main(int argc, char **argv) {'i', "server-id", NULL, 0, GETOPT_OP_NONE}, {'n', NULL, NULL, MODE_NEW_DB, GETOPT_OP_ON}, {'\0', "protocol", NULL, 0, GETOPT_OP_NONE}, - {'\0', "version", NULL, MODE_VERSION, GETOPT_OP_UPDATE}, + {'\0', "version", NULL, ACTION_VERSION, GETOPT_OP_UPDATE}, {'\0', "log-path", NULL, 0, GETOPT_OP_NONE}, {'\0', "query-log-path", NULL, 0, GETOPT_OP_NONE}, {'\0', "pid-path", NULL, 0, GETOPT_OP_NONE}, {'\0', "config-path", NULL, 0, GETOPT_OP_NONE}, - {'\0', "show-config", NULL, MODE_CONFIG, GETOPT_OP_UPDATE}, + {'\0', "show-config", NULL, ACTION_CONFIG, GETOPT_OP_UPDATE}, {'\0', "cache-limit", NULL, 0, GETOPT_OP_NONE}, {'\0', "file", NULL, 0, GETOPT_OP_NONE}, {'\0', "document-root", NULL, 0, GETOPT_OP_NONE}, @@ -2534,21 +2534,21 @@ main(int argc, char **argv) } /* ignore mode option in config file */ - mode = (mode == MODE_ERROR) ? 0 : (mode & ~MODE_MASK); + mode = (mode == ACTION_ERROR) ? 0 : (mode & ~MODE_MASK); i = grn_str_getopt(argc, argv, opts, &mode); - if (i < 0) { mode = MODE_ERROR; } - switch (mode & MODE_MASK) { - case MODE_VERSION : + if (i < 0) { mode = ACTION_ERROR; } + switch (mode & ACTION_MASK) { + case ACTION_VERSION : show_version(); return EXIT_SUCCESS; - case MODE_USAGE : + case ACTION_USAGE : show_usage(output); return EXIT_SUCCESS; - case MODE_CONFIG : - show_config(output, opts, mode & ~MODE_MASK); + case ACTION_CONFIG : + show_config(output, opts, mode & ~ACTION_MASK); return EXIT_SUCCESS; - case MODE_ERROR : + case ACTION_ERROR : show_usage(stderr); return EXIT_FAILURE; } -------------- next part -------------- HTML����������������������������...Download