diff options
Diffstat (limited to 'usr/src/cmd/sgs/elfedit/modules/common/dyn.c')
| -rw-r--r-- | usr/src/cmd/sgs/elfedit/modules/common/dyn.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/usr/src/cmd/sgs/elfedit/modules/common/dyn.c b/usr/src/cmd/sgs/elfedit/modules/common/dyn.c index ac8ec4b401..d4949e6ee7 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/dyn.c +++ b/usr/src/cmd/sgs/elfedit/modules/common/dyn.c @@ -133,7 +133,7 @@ typedef struct { Word null_ndx; /* Index of first DT_NULL */ Word num_null_ndx; /* # of DT_NULL elements */ } dyn; - dyn_opt_t optmask; /* Mask of options used */ + dyn_opt_t optmask; /* Mask of options used */ int argc; /* # of plain arguments */ const char **argv; /* Plain arguments */ const char *dyn_elt_str; /* Value string for */ @@ -1846,20 +1846,20 @@ elfedit_init(elfedit_module_version_t version) { /* For commands that only accept -o */ static elfedit_cmd_optarg_t opt_ostyle[] = { - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { NULL } }; /* For commands that only accept -and, -cmp, -o, -or */ static elfedit_cmd_optarg_t opt_ostyle_bitop[] = { - { ELFEDIT_STDOA_OPT_AND, NULL, + { ELFEDIT_STDOA_OPT_AND, 0, ELFEDIT_CMDOA_F_INHERIT, DYN_OPT_F_AND, DYN_OPT_F_OR }, - { ELFEDIT_STDOA_OPT_CMP, NULL, + { ELFEDIT_STDOA_OPT_CMP, 0, ELFEDIT_CMDOA_F_INHERIT, DYN_OPT_F_CMP, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, - { ELFEDIT_STDOA_OPT_OR, NULL, + { ELFEDIT_STDOA_OPT_OR, 0, ELFEDIT_CMDOA_F_INHERIT, DYN_OPT_F_OR, DYN_OPT_F_AND }, { NULL } }; @@ -1895,7 +1895,7 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_DYNNDX_ELT) */ ELFEDIT_I18NHDL(MSG_OPTDESC_DYNNDX_ELT), 0, DYN_OPT_F_DYNNDX_ELT, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { NULL } }; @@ -1923,7 +1923,7 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_DYNNDX_ELT) */ ELFEDIT_I18NHDL(MSG_OPTDESC_DYNNDX_ELT), 0, DYN_OPT_F_DYNNDX_ELT, DYN_OPT_F_ADD }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_S), /* MSG_INTL(MSG_OPTDESC_S) */ @@ -1990,25 +1990,25 @@ elfedit_init(elfedit_module_version_t version) static const char *name_posflag1[] = { MSG_ORIG(MSG_CMD_POSFLAG1), NULL }; static elfedit_cmd_optarg_t opt_posflag1[] = { - { ELFEDIT_STDOA_OPT_AND, NULL, + { ELFEDIT_STDOA_OPT_AND, 0, ELFEDIT_CMDOA_F_INHERIT, DYN_OPT_F_AND, DYN_OPT_F_OR }, - { ELFEDIT_STDOA_OPT_CMP, NULL, + { ELFEDIT_STDOA_OPT_CMP, 0, ELFEDIT_CMDOA_F_INHERIT, DYN_OPT_F_CMP, 0 }, { MSG_ORIG(MSG_STR_MINUS_DYNNDX), /* MSG_INTL(MSG_OPTDESC_DYNNDX_VAL) */ ELFEDIT_I18NHDL(MSG_OPTDESC_DYNNDX_VAL), ELFEDIT_CMDOA_F_VALUE, DYN_OPT_F_DYNNDX_VAL, DYN_OPT_F_NEEDED }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_NEEDED), /* MSG_INTL(MSG_OPTDESC_NEEDED) */ ELFEDIT_I18NHDL(MSG_OPTDESC_NEEDED), ELFEDIT_CMDOA_F_VALUE, DYN_OPT_F_NEEDED, DYN_OPT_F_DYNNDX_VAL }, - { MSG_ORIG(MSG_STR_PREFIX), NULL, 0, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { MSG_ORIG(MSG_STR_PREFIX), 0, 0, 0 }, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, - { ELFEDIT_STDOA_OPT_OR, NULL, + { ELFEDIT_STDOA_OPT_OR, 0, ELFEDIT_CMDOA_F_INHERIT, DYN_OPT_F_OR, DYN_OPT_F_AND }, { NULL } }; |