h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-03 18:21:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

change naming convention for parsing opts

Browse Source
This commit is contained in:
Kurtis Rader
2017-06-13 13:03:32 -07:00
parent 044f5512e2
commit 59e90123ea
8 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/builtin_functions.cpp
View File

@@ -26,7 +26,7 @@
#include "wgetopt.h"
#include "wutil.h" // IWYU pragma: keep
struct functions_opts {
struct cmd_opts {
bool print_help = false;
bool erase = false;
bool list = false;
@@ -38,9 +38,9 @@ struct functions_opts {
wchar_t *description = NULL;
};
static int parse_functions_opts(struct functions_opts *opts,
int *optind, //!OCLINT(high ncss method)
int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
static int parse_cmd_opts(struct cmd_opts *opts,
int *optind, //!OCLINT(high ncss method)
int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
wchar_t *cmd = argv[0];
static const wchar_t *short_options = L"Dacehnqv";
static const struct woption long_options[] = {
@@ -258,10 +258,10 @@ static int report_function_metadata(const wchar_t *funcname, bool verbose, io_st
int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
const wchar_t *cmd = argv[0];
int argc = builtin_count_args(argv);
struct functions_opts opts;
struct cmd_opts opts;
int optind;
int retval = parse_functions_opts(&opts, &optind, argc, argv, parser, streams);
int retval = parse_cmd_opts(&opts, &optind, argc, argv, parser, streams);
if (retval != STATUS_CMD_OK) return retval;
if (opts.print_help) {