diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-12-28 14:21:43 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-12-28 14:21:43 +0000 |
| commit | 1a28a30403dd99d5c09c404cdf08638d9a2f9b8d (patch) | |
| tree | 488077d123ddbd63cff982ac30f36a6ba6f4dbb9 /usr.bin/openssl/apps.c | |
| parent | 9f3bd4e15c4676e023b75bdfb1a51fbf13adacfb (diff) | |
Provide two different function pointers for option function callbacks. This
allows for simpler code in the common cases and will allow for further
extension to support the complex cases.
Diffstat (limited to 'usr.bin/openssl/apps.c')
| -rw-r--r-- | usr.bin/openssl/apps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/openssl/apps.c b/usr.bin/openssl/apps.c index 009f48652ae..47c418f424d 100644 --- a/usr.bin/openssl/apps.c +++ b/usr.bin/openssl/apps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.c,v 1.14 2014/12/14 14:42:06 jsing Exp $ */ +/* $OpenBSD: apps.c,v 1.15 2014/12/28 14:21:42 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -2298,7 +2298,7 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed) break; case OPTION_ARG_FUNC: - if (opt->func(opt, argv[i]) != 0) + if (opt->opt.argfunc(argv[i]) != 0) return (1); break; @@ -2314,7 +2314,7 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed) break; case OPTION_FUNC: - if (opt->func(opt, NULL) != 0) + if (opt->opt.func() != 0) return (1); break; |