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/cmd/iscsiadm | |
| 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/cmd/iscsiadm')
| -rw-r--r-- | usr/src/cmd/iscsiadm/cmdparse.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr/src/cmd/iscsiadm/cmdparse.c b/usr/src/cmd/iscsiadm/cmdparse.c index 882ff3c673..b1a2f84692 100644 --- a/usr/src/cmd/iscsiadm/cmdparse.c +++ b/usr/src/cmd/iscsiadm/cmdparse.c @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright 2020 Joyent Inc. + */ + #include <stdlib.h> #include <stdio.h> #include <sys/types.h> @@ -70,7 +74,7 @@ static void subUsage(uint_t, subcommand_t *); static void subUsageObject(uint_t, subcommand_t *, object_t *); static int getObject(char *, object_t **); static int getObjectRules(uint_t, objectRules_t **); -static char *getLongOption(int); +static const char *getLongOption(int); static optionProp_t *getOptions(uint_t, uint_t); static char *getOptionArgDesc(int); extern void seeMan(void); @@ -208,7 +212,7 @@ getOptions(uint_t object, uint_t subcommand) * on success, long option name * on failure, NULL */ -static char * +static const char * getLongOption(int shortOption) { struct option *op; @@ -319,7 +323,7 @@ subUsageObject(uint_t usageType, subcommand_t *subcommand, object_t *objp) opCmd_t *opCmd = NULL; optionProp_t *options; char *optionArgDesc; - char *longOpt; + const char *longOpt; if (getObjectRules(objp->value, &objRules) != 0) { |