diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-25 13:52:16 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-25 13:52:16 +0000 |
| commit | d152c784e9ec5ececac97129ea92fe6afc57078c (patch) | |
| tree | 79232acc096ef9414315de612d4587007b1606d5 /usr/src/cmd/sgs/elfedit/modules/common/cap.c | |
| parent | 394dadbc86535e5075b260851683ccbb3f571c6d (diff) | |
| parent | 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb (diff) | |
| download | illumos-joyent-d152c784e9ec5ececac97129ea92fe6afc57078c.tar.gz | |
[illumos-gate merge]
commit 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb
11151 libpkcs11: NULL pointer errors
commit c0e21d6af8bfe88f1c49c7c12d4537b663fe9db9
11150 libdladm: NULL pointer errors
commit c8a3ee0e3658c32402e6bd505596d4fa45bfe17c
11208 add mdb format character for jazzed-up binary output
11206 mdb output autowrapping still subtly wrong
11207 many 64-bit mdb format characters have insufficient width
commit b1e2e3fb17324e9ddf43db264a0c64da7756d9e6
10936 umem_genasm needs to be stricter about segments
10937 Clean up umem smatch and cerrwarn
commit 3c308cd1a430039e3b6327544d02ab1a5384066a
11259 mandoc should allow ERRORS section in all man section 7 variants
commit 3970c09844d4f5e54234620de153ab71a05afbca
11149 libpkg: NULL pointer errors
commit f00128d8e2d39a5be61357047531dc79fde48623
11134 libdevinfo: NULL pointer errors
commit 4a014300cea3d870431d7e52aff6781d3c63e5d1
11143 libscf: NULL pointer errors
commit d60ff33691519a9505afc8818735139f4dfd0c31
11141 libdtrace: NULL pointer errors
commit 7c207486dba29784d04c67b7d1a97e8cff0a4ff9
11139 libcpc: NULL pointer errors
commit ce67cb245e522293fca567799070a5cdd4267929
11131 libtsol: NULL pointer errors
commit 559f8b540657be5e8d59b0b7017058a7ac6ba4bb
11127 libsip: NULL pointer errors
commit f21450b8fa7a1530d48dc06401e691df1b8965fa
11121 libadm: NULL pointer errors
commit 5f060f5100426465bddc18c6f81b146ccee30eb8
11120 libpcidb: NULL pointer errors
commit 22ca2f96318fd461cfbcc23fd450623fe08610a3
11109 librtld_db: NULL pointer errors
commit 6888a8ba15f151decee7821a09e34fed2fb63513
11107 mcs: NULL pointer errors
commit 9320f4959b6c72e7a6d056623827091cace259ee
11106 elfedit: NULL pointer errors
commit fb8f92baa78fdf1ddda6f49125fbd59366393ac8
11101 libld: NULL pointer errors
Conflicts:
usr/src/lib/libumem/amd64/umem_genasm.c
Diffstat (limited to 'usr/src/cmd/sgs/elfedit/modules/common/cap.c')
| -rw-r--r-- | usr/src/cmd/sgs/elfedit/modules/common/cap.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/usr/src/cmd/sgs/elfedit/modules/common/cap.c b/usr/src/cmd/sgs/elfedit/modules/common/cap.c index 6b94a6f8f4..7430d4d84f 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/cap.c +++ b/usr/src/cmd/sgs/elfedit/modules/common/cap.c @@ -131,7 +131,7 @@ typedef struct { struct { /* String table */ elfedit_section_t *sec; } str; - cap_opt_t optmask; /* Mask of options used */ + cap_opt_t optmask; /* Mask of options used */ int argc; /* # of plain arguments */ const char **argv; /* Plain arguments */ } ARGSTATE; @@ -1237,18 +1237,18 @@ elfedit_init(elfedit_module_version_t version) { /* For commands that only accept -capid, -and, -cmp, -o, and -or */ static elfedit_cmd_optarg_t opt_ostyle_capid_bitop[] = { - { ELFEDIT_STDOA_OPT_AND, NULL, + { ELFEDIT_STDOA_OPT_AND, 0, ELFEDIT_CMDOA_F_INHERIT, CAP_OPT_F_AND, CAP_OPT_F_OR }, { MSG_ORIG(MSG_STR_MINUS_CAPID), /* MSG_INTL(MSG_OPTDESC_CAPID) */ ELFEDIT_I18NHDL(MSG_OPTDESC_CAPID), ELFEDIT_CMDOA_F_VALUE, CAP_OPT_F_CAPID, CAP_OPT_F_CAPNDX }, - { MSG_ORIG(MSG_STR_IDNAME), NULL, 0 }, - { ELFEDIT_STDOA_OPT_CMP, NULL, + { MSG_ORIG(MSG_STR_IDNAME), 0, 0 }, + { ELFEDIT_STDOA_OPT_CMP, 0, ELFEDIT_CMDOA_F_INHERIT, CAP_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, CAP_OPT_F_OR, CAP_OPT_F_AND }, { NULL } }; @@ -1259,7 +1259,7 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_CAPID) */ ELFEDIT_I18NHDL(MSG_OPTDESC_CAPID), ELFEDIT_CMDOA_F_VALUE, CAP_OPT_F_CAPID, CAP_OPT_F_CAPNDX }, - { MSG_ORIG(MSG_STR_IDNAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_IDNAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_CAPNDX), /* MSG_INTL(MSG_OPTDESC_CAPNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_CAPNDX), 0, @@ -1290,12 +1290,12 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_CAPID) */ ELFEDIT_I18NHDL(MSG_OPTDESC_CAPID), ELFEDIT_CMDOA_F_VALUE, CAP_OPT_F_CAPID, CAP_OPT_F_CAPNDX }, - { MSG_ORIG(MSG_STR_IDNAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_IDNAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_CAPNDX), /* MSG_INTL(MSG_OPTDESC_CAPNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_CAPNDX), 0, CAP_OPT_F_CAPNDX, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { NULL } }; @@ -1319,12 +1319,12 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_CAPID) */ ELFEDIT_I18NHDL(MSG_OPTDESC_CAPID), ELFEDIT_CMDOA_F_VALUE, CAP_OPT_F_CAPID, CAP_OPT_F_CAPNDX }, - { MSG_ORIG(MSG_STR_IDNAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_IDNAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_CAPNDX), /* MSG_INTL(MSG_OPTDESC_CAPNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_CAPNDX), 0, CAP_OPT_F_CAPNDX, 0 }, - { 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) */ |