{"thread":{"id":"56308","subject":"[PATCH] builtin/fsmonitor--daemon: use parse-options API fully","startedAt":"2021-08-17T10:27:59Z","lastAt":"2021-08-17T18:03:11Z","messageCount":2,"participants":["Carlo Marcelo Arenas Belón","Jeff Hostetler"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"432938","messageId":"20210817102710.23916-1-carenas@gmail.com","threadId":"56308","inReplyTo":null,"subject":"[PATCH] builtin/fsmonitor--daemon: use parse-options API fully","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2021-08-17T10:27:10Z","receivedAt":"2021-08-17T10:27:59Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"--help and -h are already handled internally so just parse_options()\ndo the parsing and extract the command from the remaining options.\n\nas a side effect, avoid setting a variable argc to a value that was\nnever used.\n\nSigned-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>\n---\n builtin/fsmonitor--daemon.c | 15 ++++-----------\n 1 file changed, 4 insertions(+), 11 deletions(-)\n\ndiff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c\nindex 25f18f2726..d6a6010512 100644\n--- a/builtin/fsmonitor--daemon.c\n+++ b/builtin/fsmonitor--daemon.c\n@@ -1511,20 +1511,13 @@ int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\tif (argc < 2)\n-\t\tusage_with_options(builtin_fsmonitor__daemon_usage, options);\n-\n-\tif (argc == 2 && !strcmp(argv[1], \"-h\"))\n+\targc = parse_options(argc, argv, prefix, options,\n+\t\t\t     builtin_fsmonitor__daemon_usage, 0);\n+\tif (argc != 1)\n \t\tusage_with_options(builtin_fsmonitor__daemon_usage, options);\n+\tsubcmd = argv[0];\n \n \tgit_config(fsmonitor_config, NULL);\n-\n-\tsubcmd = argv[1];\n-\targv--;\n-\targc++;\n-\n-\targc = parse_options(argc, argv, prefix, options,\n-\t\t\t     builtin_fsmonitor__daemon_usage, 0);\n \tif (fsmonitor__ipc_threads < 1)\n \t\tdie(_(\"invalid 'ipc-threads' value (%d)\"),\n \t\t    fsmonitor__ipc_threads);\n-- \n2.33.0.476.gf000ecbed9\n\n"},{"id":"433013","messageId":"9e21753d-49c7-8d4d-de6d-d6102d3aa8da@jeffhostetler.com","threadId":"56308","inReplyTo":"20210817102710.23916-1-carenas@gmail.com","subject":"Re: [PATCH] builtin/fsmonitor--daemon: use parse-options API fully","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2021-08-17T18:03:05Z","receivedAt":"2021-08-17T18:03:11Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"\n\nOn 8/17/21 6:27 AM, Carlo Marcelo Arenas Belón wrote:\n> --help and -h are already handled internally so just parse_options()\n> do the parsing and extract the command from the remaining options.\n> \n> as a side effect, avoid setting a variable argc to a value that was\n> never used.\n> \n> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>\n > ...\n\nThanks again.  I'll take a look and squash this in.\nJeff\n\n"}]}