[PATCH 3/2] parse-options.c: introduce OPT_DATE
- From
Michele Ballabio <barra_cuda@katamail.com>
- Date
- Mar 24, 2008, 14:02 UTC
- Message-ID
- <200803241502.21465.barra_cuda@katamail.com>
- In-Reply-To
- <alpine.LSU.1.00.0803241409400.4353@racer.site>
There are quite a few places that will need to call approxidate(), when they'll adopt the parse-options system, so this patch adds the function parse_opt_approxidate_cb(), used by OPT_DATE, and converts the only user so far.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> --- On Monday 24 March 2008, Johannes Schindelin wrote:
> And maybe a
>
> #define OPT_DATE(s, l, v, h) { OPTION_CALLBACK, (s), (l), (v), "time",
> (h), 0, parse_opt_approxidate_cb }Oh, right. Somehow I thought it was simpler not to do this.
Thank you for your review and suggestions.
This is on top of [PATCH 2/2] builtin-prune.c: fix object parsing and use parse_options()
builtin-prune.c | 12 ++---------- parse-options.c | 7 +++++++ parse-options.h | 5 +++++ 3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/builtin-prune.c b/builtin-prune.c index 7b3e15d..40581df 100644 --- a/builtin-prune.c +++ b/builtin-prune.c @@ -125,13 +125,6 @@ static void remove_temporary_files(void) closedir(dir); } -static int parse_opt_expire(const struct option *opt, const char *arg, - int unset) -{ - expire = approxidate(arg); - return 0; -} - int cmd_prune(int argc, const char **argv, const char *prefix) { struct rev_info revs; @@ -139,9 +132,8 @@ int cmd_prune(int argc, const char **argv, const char *prefix) const struct option options[] = { OPT_BOOLEAN('n', NULL, &show_only, "do not remove, show only"), - OPT_CALLBACK(0, "expire", &expire, "time", - "expire objects older than <time>", - parse_opt_expire), + OPT_DATE(0, "expire", &expire, + "expire objects older than <time>"), OPT_END() }; diff --git a/parse-options.c b/parse-options.c index 8e64316..6ec7fe8 100644 --- a/parse-options.c +++ b/parse-options.c @@ -409,3 +409,10 @@ int parse_opt_abbrev_cb(const struct option *opt, const char *arg, int unset) *(int *)(opt->value) = v; return 0; } + +int parse_opt_approxidate_cb(const struct option *opt, const char *arg, + int unset) +{ + *(unsigned int *)(opt->value) = approxidate(arg); + return 0; +} diff --git a/parse-options.h b/parse-options.h index 1af62b0..c98f89e 100644 --- a/parse-options.h +++ b/parse-options.h @@ -110,6 +110,8 @@ extern NORETURN void usage_with_options(const char * const *usagestr, /*----- some often used options -----*/ extern int parse_opt_abbrev_cb(const struct option *, const char *, int); +extern int parse_opt_approxidate_cb(const struct option *, const char *, + int); #define OPT__VERBOSE(var) OPT_BOOLEAN('v', "verbose", (var), "be verbose") #define OPT__QUIET(var) OPT_BOOLEAN('q', "quiet", (var), "be quiet") @@ -118,5 +120,8 @@ extern int parse_opt_abbrev_cb(const struct option *, const char *, int); { OPTION_CALLBACK, 0, "abbrev", (var), "n", \ "use <n> digits to display SHA-1s", \ PARSE_OPT_OPTARG, &parse_opt_abbrev_cb, 0 } +#define OPT_DATE(s, l, v, h) \ + { OPTION_CALLBACK, (s), (l), (v), "time",(h), 0, \ + parse_opt_approxidate_cb } #endif
-- 1.5.4.3