diff options
| author | Mike Zeller <mike@mikezeller.net> | 2020-03-11 16:42:06 -0400 |
|---|---|---|
| committer | Mike Zeller <mike@mikezeller.net> | 2020-03-11 16:42:06 -0400 |
| commit | 2803e163cd303fbc63f832f544bc59c4ee562252 (patch) | |
| tree | c901ef8fa7580dcebfb11316f6bb49d498bd40a8 /usr/src/common | |
| parent | dd05dd221f0e26bb86692b7b69c8dbeab8f4c0e5 (diff) | |
| parent | 1de02da27664d38cedeccf227bd4ae92d32619d9 (diff) | |
| download | illumos-joyent-bhyve-sync.tar.gz | |
Merge remote-tracking branch 'origin/master' into bhyve-syncbhyve-sync
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/cmdparse/cmdparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/common/cmdparse/cmdparse.c b/usr/src/common/cmdparse/cmdparse.c index 07ad6ed13a..bc55dc8dce 100644 --- a/usr/src/common/cmdparse/cmdparse.c +++ b/usr/src/common/cmdparse/cmdparse.c @@ -24,7 +24,7 @@ */ /* - * Copyright (c) 2018, Joyent, Inc. + * Copyright 2020 Joyent Inc. */ #include <stdlib.h> @@ -71,7 +71,7 @@ static int getSubcommandProps(char *, subCommandProps_t **); static char *getExecBasename(char *); static void usage(uint_t); static void subUsage(uint_t, subCommandProps_t *); -static char *getLongOption(int); +static const char *getLongOption(int); static char *getOptionArgDesc(int); /* global data */ @@ -121,7 +121,7 @@ getSubcommandProps(char *subCommand, subCommandProps_t **subCommandProps) * on success, long option name * on failure, NULL */ -static char * +static const char * getLongOption(int shortOption) { struct option *op; @@ -171,7 +171,7 @@ subUsage(uint_t usageType, subCommandProps_t *subcommand) { int i; char *optionArgDesc; - char *longOpt; + const char *longOpt; if (usageType == GENERAL_USAGE) { (void) printf("%s:\t%s %s [", gettext("Usage"), commandName, |