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 | |
| 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
54 files changed, 451 insertions, 487 deletions
diff --git a/usr/src/cmd/sgs/elfedit/common/elfedit.c b/usr/src/cmd/sgs/elfedit/common/elfedit.c index 2018d93bdd..8894ef312b 100644 --- a/usr/src/cmd/sgs/elfedit/common/elfedit.c +++ b/usr/src/cmd/sgs/elfedit/common/elfedit.c @@ -268,7 +268,7 @@ elfedit_msg(elfedit_msg_t type, const char *format, ...) { typedef enum { /* What to do after finished */ DISP_RET = 0, /* Return to caller */ - DISP_JMP = 1, /* if (interactive) longjmp else exit */ + DISP_JMP = 1, /* if (interactive) longjmp else exit */ DISP_EXIT = 2 /* exit under all circumstances */ } DISP; @@ -1420,7 +1420,7 @@ path_is_so(const char *path) static const char * elfedit_basename(const char *path, const char *tail, char *buf, size_t bufsiz) { - const char *s; + const char *s; if (tail == NULL) tail = path + strlen(path); @@ -1676,7 +1676,7 @@ validate_optarg(elfedit_cmd_optarg_t *optarg, int isopt, MODLIST_T *moddef, /* MSG_INTL(MSG_ERR_CMDOA_VALNAM) */ FAIL(MSG_ERR_CMDOA_VALNAM); } - if ((oa1->oa_help != NULL) || (oa1->oa_flags != 0) || + if ((oa1->oa_help != 0) || (oa1->oa_flags != 0) || (oa1->oa_idmask != 0) || (oa1->oa_excmask != 0)) { /* MSG_INTL(MSG_ERR_CMDOA_VALNOT0) */ FAIL(MSG_ERR_CMDOA_VALNOT0); @@ -1977,7 +1977,7 @@ elfedit_load_moddir(const char *dirpath, int must_exist, int abs_path) char path[PATH_MAX + 1]; DIR *dir; struct dirent *dp; - const char *tail; + const char *tail; dir = opendir(dirpath); if (dir == NULL) { @@ -3225,7 +3225,7 @@ cmd_match_fcn(WordCompletion *cpl, void *data, const char *line, int word_end) } skip_one = 0; ostyle_ndx = -1; - if ((strcmp(argv[i], MSG_ORIG(MSG_STR_MINUS_MINUS)) == NULL) || + if ((strcmp(argv[i], MSG_ORIG(MSG_STR_MINUS_MINUS)) == 0) || (*argv[i] != '-')) { opt_term_seen = 1; continue; 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) */ 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 } }; diff --git a/usr/src/cmd/sgs/elfedit/modules/common/ehdr.c b/usr/src/cmd/sgs/elfedit/modules/common/ehdr.c index fe377df0eb..8de483834a 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/ehdr.c +++ b/usr/src/cmd/sgs/elfedit/modules/common/ehdr.c @@ -140,7 +140,7 @@ typedef enum { */ typedef struct { elfedit_obj_state_t *obj_state; - ehdr_opt_t optmask; /* Mask of options used */ + ehdr_opt_t optmask; /* Mask of options used */ int argc; /* # of plain arguments */ const char **argv; /* Plain arguments */ } ARGSTATE; @@ -1763,7 +1763,7 @@ elfedit_init(elfedit_module_version_t version) { /* Many of the commands only accept -o */ static elfedit_cmd_optarg_t opt_std[] = { - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { NULL } }; @@ -1861,13 +1861,13 @@ elfedit_init(elfedit_module_version_t version) static const char *name_e_flags[] = { MSG_ORIG(MSG_CMD_E_FLAGS), NULL }; static elfedit_cmd_optarg_t opt_e_flags[] = { - { ELFEDIT_STDOA_OPT_AND, NULL, + { ELFEDIT_STDOA_OPT_AND, 0, ELFEDIT_CMDOA_F_INHERIT, EHDR_OPT_F_AND, EHDR_OPT_F_OR }, - { ELFEDIT_STDOA_OPT_CMP, NULL, + { ELFEDIT_STDOA_OPT_CMP, 0, ELFEDIT_CMDOA_F_INHERIT, EHDR_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, EHDR_OPT_F_OR, EHDR_OPT_F_AND }, { NULL } }; @@ -1938,7 +1938,7 @@ elfedit_init(elfedit_module_version_t version) static const char *name_e_shstrndx[] = { MSG_ORIG(MSG_CMD_E_SHSTRNDX), NULL }; static elfedit_cmd_optarg_t opt_e_shstrndx[] = { - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ diff --git a/usr/src/cmd/sgs/elfedit/modules/common/phdr.c b/usr/src/cmd/sgs/elfedit/modules/common/phdr.c index e4129c9de1..0300913f2e 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/phdr.c +++ b/usr/src/cmd/sgs/elfedit/modules/common/phdr.c @@ -130,7 +130,7 @@ typedef enum { */ typedef struct { elfedit_obj_state_t *obj_state; - phdr_opt_t optmask; /* Mask of options used */ + phdr_opt_t optmask; /* Mask of options used */ int argc; /* # of plain arguments */ const char **argv; /* Plain arguments */ int ndx_set; /* True if ndx is valid */ @@ -1078,7 +1078,7 @@ elfedit_init(elfedit_module_version_t version) { /* Multiple commands accept a standard set of options */ static elfedit_cmd_optarg_t opt_std[] = { - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_PHNDX), /* MSG_INTL(MSG_OPTDESC_PHNDX) */ @@ -1203,17 +1203,17 @@ elfedit_init(elfedit_module_version_t version) static const char *name_p_flags[] = { MSG_ORIG(MSG_CMD_P_FLAGS), NULL }; static elfedit_cmd_optarg_t opt_p_flags[] = { - { ELFEDIT_STDOA_OPT_AND, NULL, + { ELFEDIT_STDOA_OPT_AND, 0, ELFEDIT_CMDOA_F_INHERIT, PHDR_OPT_F_AND, PHDR_OPT_F_OR }, - { ELFEDIT_STDOA_OPT_CMP, NULL, + { ELFEDIT_STDOA_OPT_CMP, 0, ELFEDIT_CMDOA_F_INHERIT, PHDR_OPT_F_CMP, 0 }, { MSG_ORIG(MSG_STR_MINUS_PHNDX), /* MSG_INTL(MSG_OPTDESC_PHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_PHNDX), 0, PHDR_OPT_F_PHNDX, 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, PHDR_OPT_F_OR, PHDR_OPT_F_AND }, { NULL } }; @@ -1247,7 +1247,7 @@ elfedit_init(elfedit_module_version_t version) /* phdr:interp */ static const char *name_interp[] = { MSG_ORIG(MSG_CMD_INTERP), NULL }; static elfedit_cmd_optarg_t opt_interp[] = { - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { NULL } }; diff --git a/usr/src/cmd/sgs/elfedit/modules/common/shdr.c b/usr/src/cmd/sgs/elfedit/modules/common/shdr.c index 72881d02f9..e35906f0cb 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/shdr.c +++ b/usr/src/cmd/sgs/elfedit/modules/common/shdr.c @@ -120,7 +120,7 @@ typedef enum { */ typedef struct { elfedit_obj_state_t *obj_state; - shdr_opt_t optmask; /* Mask of options used */ + shdr_opt_t optmask; /* Mask of options used */ int argc; /* # of plain arguments */ const char **argv; /* Plain arguments */ } ARGSTATE; @@ -216,7 +216,7 @@ print_shdr(SHDR_CMD_T cmd, int autoprint, ARGSTATE *argstate, Ehdr *ehdr = argstate->obj_state->os_ehdr; uchar_t osabi = ehdr->e_ident[EI_OSABI]; Half mach = ehdr->e_machine; - elfedit_section_t *ref_sec = &argstate->obj_state->os_secarr[ndx]; + elfedit_section_t *ref_sec = &argstate->obj_state->os_secarr[ndx]; if ((autoprint && ((elfedit_flags() & ELFEDIT_F_AUTOPRINT) == 0)) || @@ -939,7 +939,7 @@ elfedit_init(elfedit_module_version_t version) { /* Multiple commands accept only the standard set of options */ static elfedit_cmd_optarg_t opt_std[] = { - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ @@ -957,7 +957,7 @@ elfedit_init(elfedit_module_version_t version) * plus -value_shnam and -value_shtyp. */ static elfedit_cmd_optarg_t opt_infolink[] = { - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ @@ -1052,13 +1052,13 @@ elfedit_init(elfedit_module_version_t version) static const char *name_sh_flags[] = { MSG_ORIG(MSG_CMD_SH_FLAGS), NULL }; static elfedit_cmd_optarg_t opt_sh_flags[] = { - { ELFEDIT_STDOA_OPT_AND, NULL, + { ELFEDIT_STDOA_OPT_AND, 0, ELFEDIT_CMDOA_F_INHERIT, SHDR_OPT_F_AND, SHDR_OPT_F_OR }, - { ELFEDIT_STDOA_OPT_CMP, NULL, + { ELFEDIT_STDOA_OPT_CMP, 0, ELFEDIT_CMDOA_F_INHERIT, SHDR_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, SHDR_OPT_F_OR, SHDR_OPT_F_AND }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ @@ -1120,7 +1120,7 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_NAME_OFFSET) */ ELFEDIT_I18NHDL(MSG_OPTDESC_NAME_OFFSET), 0, SHDR_OPT_F_NAMOFFSET, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ diff --git a/usr/src/cmd/sgs/elfedit/modules/common/str.c b/usr/src/cmd/sgs/elfedit/modules/common/str.c index 968bf5d214..2767284a11 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/str.c +++ b/usr/src/cmd/sgs/elfedit/modules/common/str.c @@ -111,7 +111,7 @@ typedef enum { */ typedef struct { elfedit_obj_state_t *obj_state; - str_opt_t optmask; /* Mask of options used */ + str_opt_t optmask; /* Mask of options used */ int argc; /* # of plain arguments */ const char **argv; /* Plain arguments */ @@ -750,7 +750,7 @@ cpl_sh_opt(elfedit_obj_state_t *obj_state, void *cpldata, int argc, { enum { NAME, INDEX, TYPE } op; elfedit_section_t *sec; - Word ndx; + Word ndx; if ((argc != num_opt) || (argc < 2)) return; @@ -948,23 +948,23 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_ANY) */ ELFEDIT_I18NHDL(MSG_OPTDESC_ANY), 0, STR_OPT_F_ANY, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNAM), /* MSG_INTL(MSG_OPTDESC_SHNAM) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNAM), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHNAME, STR_OPT_F_SHNDX | STR_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_NAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_NAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNDX), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHNDX, STR_OPT_F_SHNAME | STR_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHTYP), /* MSG_INTL(MSG_OPTDESC_SHTYP) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHTYP), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHTYP, STR_OPT_F_SHNAME | STR_OPT_F_SHNDX }, - { MSG_ORIG(MSG_STR_TYPE), NULL, 0 }, + { MSG_ORIG(MSG_STR_TYPE), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_STRNDX), /* MSG_INTL(MSG_OPTDESC_STRNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_STRNDX), 0, @@ -987,7 +987,7 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_ANY) */ ELFEDIT_I18NHDL(MSG_OPTDESC_ANY), 0, STR_OPT_F_ANY, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_NOTERM), /* MSG_INTL(MSG_OPTDESC_NOTERM) */ @@ -997,17 +997,17 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_SHNAM) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNAM), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHNAME, STR_OPT_F_SHNDX | STR_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_NAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_NAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNDX), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHNDX, STR_OPT_F_SHNAME | STR_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHTYP), /* MSG_INTL(MSG_OPTDESC_SHTYP) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHTYP), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHTYP, STR_OPT_F_SHNAME | STR_OPT_F_SHNDX }, - { MSG_ORIG(MSG_STR_TYPE), NULL, 0 }, + { MSG_ORIG(MSG_STR_TYPE), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_STRNDX), /* MSG_INTL(MSG_OPTDESC_STRNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_STRNDX), 0, @@ -1030,23 +1030,23 @@ elfedit_init(elfedit_module_version_t version) static const char *name_add[] = { MSG_ORIG(MSG_CMD_ADD), NULL }; static elfedit_cmd_optarg_t opt_add[] = { - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNAM), /* MSG_INTL(MSG_OPTDESC_SHNAM) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNAM), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHNAME, STR_OPT_F_SHNDX | STR_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_NAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_NAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNDX), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHNDX, STR_OPT_F_SHNAME | STR_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHTYP), /* MSG_INTL(MSG_OPTDESC_SHTYP) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHTYP), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHTYP, STR_OPT_F_SHNAME | STR_OPT_F_SHNDX }, - { MSG_ORIG(MSG_STR_TYPE), NULL, 0 }, + { MSG_ORIG(MSG_STR_TYPE), 0, 0 }, { NULL } }; static elfedit_cmd_optarg_t arg_add[] = { @@ -1065,23 +1065,23 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_ANY) */ ELFEDIT_I18NHDL(MSG_OPTDESC_ANY), 0, STR_OPT_F_ANY, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNAM), /* MSG_INTL(MSG_OPTDESC_SHNAM) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNAM), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHNAME, STR_OPT_F_SHNDX | STR_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_NAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_NAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNDX), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHNDX, STR_OPT_F_SHNAME | STR_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHTYP), /* MSG_INTL(MSG_OPTDESC_SHTYP) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHTYP), ELFEDIT_CMDOA_F_VALUE, STR_OPT_F_SHTYP, STR_OPT_F_SHNAME | STR_OPT_F_SHNDX }, - { MSG_ORIG(MSG_STR_TYPE), NULL, 0 }, + { MSG_ORIG(MSG_STR_TYPE), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_STRNDX), /* MSG_INTL(MSG_OPTDESC_STRNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_STRNDX), 0, diff --git a/usr/src/cmd/sgs/elfedit/modules/common/sym.c b/usr/src/cmd/sgs/elfedit/modules/common/sym.c index 40e3a30e2e..5b0ec36291 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/sym.c +++ b/usr/src/cmd/sgs/elfedit/modules/common/sym.c @@ -116,7 +116,7 @@ typedef enum { /* index section */ SYM_OPT_F_NAMOFFSET = 2, /* -name_offset: sym:st_name name arg */ /* is numeric offset */ - /* rather than ASCII string */ + /* rather than ASCII string */ SYM_OPT_F_SECSHNDX = 4, /* -secshndx: Section arg is */ /* section index, not name */ SYM_OPT_F_SECSHTYP = 8, /* -secshtyp: Section arg is */ @@ -171,7 +171,7 @@ typedef struct { } SYMSTATE; typedef struct { elfedit_obj_state_t *obj_state; - sym_opt_t optmask; /* Mask of options used */ + sym_opt_t optmask; /* Mask of options used */ int argc; /* # of plain arguments */ const char **argv; /* Plain arguments */ int numsymstate; /* # of items in symstate[] */ @@ -1471,7 +1471,7 @@ cpl_sh_opt(elfedit_obj_state_t *obj_state, void *cpldata, int argc, { enum { NAME, INDEX, TYPE } op; elfedit_symtab_t *symtab; - Word tblndx; + Word tblndx; if ((argc != num_opt) || (argc < 2)) return; @@ -1689,21 +1689,21 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_SHNAM) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNAM), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHNAME, SYM_OPT_F_SHNDX | SYM_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_NAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_NAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNDX), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHNDX, SYM_OPT_F_SHNAME | SYM_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHTYP), /* MSG_INTL(MSG_OPTDESC_SHTYP) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHTYP), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHTYP, SYM_OPT_F_SHNAME | SYM_OPT_F_SHNDX }, - { MSG_ORIG(MSG_STR_TYPE), NULL, 0 }, + { MSG_ORIG(MSG_STR_TYPE), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SYMNDX), /* MSG_INTL(MSG_OPTDESC_SYMNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SYMNDX), 0, SYM_OPT_F_SYMNDX }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0 }, { NULL } }; @@ -1719,17 +1719,17 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_SHNAM) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNAM), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHNAME, SYM_OPT_F_SHNDX | SYM_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_NAME), NULL, 0 }, + { MSG_ORIG(MSG_STR_NAME), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNDX), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHNDX, SYM_OPT_F_SHNAME | SYM_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHTYP), /* MSG_INTL(MSG_OPTDESC_SHTYP) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHTYP), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHTYP, SYM_OPT_F_SHNAME | SYM_OPT_F_SHNDX }, - { MSG_ORIG(MSG_STR_TYPE), NULL, 0 }, + { MSG_ORIG(MSG_STR_TYPE), 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SYMNDX), /* MSG_INTL(MSG_OPTDESC_SYMNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SYMNDX), 0, SYM_OPT_F_SYMNDX }, @@ -1781,17 +1781,17 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_SHNAM) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNAM), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHNAME, SYM_OPT_F_SHNDX | SYM_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_NAME), NULL, 0, 0 }, + { MSG_ORIG(MSG_STR_NAME), 0, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNDX), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHNDX, SYM_OPT_F_SHNAME | SYM_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHTYP), /* MSG_INTL(MSG_OPTDESC_SHTYP) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHTYP), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHTYP, SYM_OPT_F_SHNAME | SYM_OPT_F_SHNDX }, - { MSG_ORIG(MSG_STR_TYPE), NULL, 0, 0 }, + { MSG_ORIG(MSG_STR_TYPE), 0, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SYMNDX), /* MSG_INTL(MSG_OPTDESC_SYMNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SYMNDX), 0, @@ -1800,7 +1800,7 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_NAME_OFFSET) */ ELFEDIT_I18NHDL(MSG_OPTDESC_NAME_OFFSET), 0, SYM_OPT_F_NAMOFFSET, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { NULL } }; @@ -1842,22 +1842,22 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_SHNAM) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNAM), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHNAME, SYM_OPT_F_SHNDX | SYM_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_NAME), NULL, 0, 0 }, + { MSG_ORIG(MSG_STR_NAME), 0, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHNDX), /* MSG_INTL(MSG_OPTDESC_SHNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHNDX), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHNDX, SYM_OPT_F_SHNAME | SYM_OPT_F_SHTYP }, - { MSG_ORIG(MSG_STR_INDEX), NULL, 0, 0 }, + { MSG_ORIG(MSG_STR_INDEX), 0, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SHTYP), /* MSG_INTL(MSG_OPTDESC_SHTYP) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SHTYP), ELFEDIT_CMDOA_F_VALUE, SYM_OPT_F_SHTYP, SYM_OPT_F_SHNAME | SYM_OPT_F_SHNDX }, - { MSG_ORIG(MSG_STR_TYPE), NULL, 0, 0 }, + { MSG_ORIG(MSG_STR_TYPE), 0, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SYMNDX), /* MSG_INTL(MSG_OPTDESC_SYMNDX) */ ELFEDIT_I18NHDL(MSG_OPTDESC_SYMNDX), 0, SYM_OPT_F_SYMNDX, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SECSHNDX), /* MSG_INTL(MSG_OPTDESC_SECSHNDX) */ diff --git a/usr/src/cmd/sgs/elfedit/modules/common/syminfo.c b/usr/src/cmd/sgs/elfedit/modules/common/syminfo.c index c06f3be6cb..59b78c8587 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/syminfo.c +++ b/usr/src/cmd/sgs/elfedit/modules/common/syminfo.c @@ -109,7 +109,7 @@ typedef enum { */ typedef struct { elfedit_obj_state_t *obj_state; - syminfo_opt_t optmask; /* Mask of options used */ + syminfo_opt_t optmask; /* Mask of options used */ int argc; /* # of plain arguments */ const char **argv; /* Plain arguments */ struct { /* Syminfo */ @@ -796,7 +796,7 @@ elfedit_init(elfedit_module_version_t version) /* MSG_INTL(MSG_OPTDESC_NEEDED) */ ELFEDIT_I18NHDL(MSG_OPTDESC_NEEDED), 0, SYMINFO_OPT_F_NEEDED, 0 }, - { ELFEDIT_STDOA_OPT_O, NULL, + { ELFEDIT_STDOA_OPT_O, 0, ELFEDIT_CMDOA_F_INHERIT, 0, 0 }, { MSG_ORIG(MSG_STR_MINUS_SYMNDX), /* MSG_INTL(MSG_OPTDESC_SYMNDX) */ @@ -820,13 +820,13 @@ elfedit_init(elfedit_module_version_t version) static const char *name_si_flags[] = { MSG_ORIG(MSG_CMD_SI_FLAGS), NULL }; static elfedit_cmd_optarg_t opt_si_flags[] = { - { ELFEDIT_STDOA_OPT_AND, NULL, ELFEDIT_CMDOA_F_INHERIT, + { ELFEDIT_STDOA_OPT_AND, 0, ELFEDIT_CMDOA_F_INHERIT, SYMINFO_OPT_F_AND, SYMINFO_OPT_F_OR }, - { ELFEDIT_STDOA_OPT_CMP, NULL, + { ELFEDIT_STDOA_OPT_CMP, 0, ELFEDIT_CMDOA_F_INHERIT, SYMINFO_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_CMDOA_F_INHERIT, + { ELFEDIT_STDOA_OPT_OR, 0, ELFEDIT_CMDOA_F_INHERIT, SYMINFO_OPT_F_OR, SYMINFO_OPT_F_AND }, { MSG_ORIG(MSG_STR_MINUS_SYMNDX), /* MSG_INTL(MSG_OPTDESC_SYMNDX) */ diff --git a/usr/src/cmd/sgs/libld/common/machrel.amd.c b/usr/src/cmd/sgs/libld/common/machrel.amd.c index dbdae79bd1..4361980887 100644 --- a/usr/src/cmd/sgs/libld/common/machrel.amd.c +++ b/usr/src/cmd/sgs/libld/common/machrel.amd.c @@ -1322,7 +1322,7 @@ ld_reloc_local(Rel_desc * rsp, Ofl_desc * ofl) /* * Perform relocation. */ - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); } @@ -1389,7 +1389,7 @@ ld_reloc_TLS(Boolean local, Rel_desc * rsp, Ofl_desc * ofl) GOT_REF_TLSLD, ofl, rsp)) == NULL)) { if (ld_assign_got_TLS(local, rsp, ofl, sdp, gnp, GOT_REF_TLSLD, - FLG_REL_MTLS, rtype, R_AMD64_DTPMOD64, NULL) == S_ERROR) + FLG_REL_MTLS, rtype, R_AMD64_DTPMOD64, 0) == S_ERROR) return (S_ERROR); } else if (IS_TLS_GD(rtype) && diff --git a/usr/src/cmd/sgs/libld/common/machrel.intel.c b/usr/src/cmd/sgs/libld/common/machrel.intel.c index d2b72c78a6..65c5908f51 100644 --- a/usr/src/cmd/sgs/libld/common/machrel.intel.c +++ b/usr/src/cmd/sgs/libld/common/machrel.intel.c @@ -1269,7 +1269,7 @@ ld_reloc_local(Rel_desc * rsp, Ofl_desc * ofl) Word ortype = rsp->rel_rtype; rsp->rel_rtype = R_386_RELATIVE; - if (ld_add_outrel(NULL, rsp, ofl) == S_ERROR) + if (ld_add_outrel(0, rsp, ofl) == S_ERROR) return (S_ERROR); rsp->rel_rtype = ortype; } @@ -1313,7 +1313,7 @@ ld_reloc_local(Rel_desc * rsp, Ofl_desc * ofl) /* * Perform relocation. */ - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); } static uintptr_t @@ -1343,7 +1343,7 @@ ld_reloc_TLS(Boolean local, Rel_desc * rsp, Ofl_desc * ofl) if (ld_assign_got_TLS(local, rsp, ofl, sdp, gnp, GOT_REF_TLSIE, FLG_REL_STLS, - rtype, R_386_TLS_TPOFF, NULL) == S_ERROR) + rtype, R_386_TLS_TPOFF, 0) == S_ERROR) return (S_ERROR); } @@ -1362,7 +1362,7 @@ ld_reloc_TLS(Boolean local, Rel_desc * rsp, Ofl_desc * ofl) if (((flags & FLG_OF_EXEC) == 0) && (rtype == R_386_TLS_IE)) { rsp->rel_rtype = R_386_RELATIVE; - return (ld_add_outrel(NULL, rsp, ofl)); + return (ld_add_outrel(0, rsp, ofl)); } return (1); } @@ -1393,7 +1393,7 @@ ld_reloc_TLS(Boolean local, Rel_desc * rsp, Ofl_desc * ofl) GOT_REF_TLSLD, ofl, NULL)) == NULL)) { if (ld_assign_got_TLS(local, rsp, ofl, sdp, gnp, GOT_REF_TLSLD, - FLG_REL_MTLS, rtype, R_386_TLS_DTPMOD32, NULL) == S_ERROR) + FLG_REL_MTLS, rtype, R_386_TLS_DTPMOD32, 0) == S_ERROR) return (S_ERROR); } else if (IS_TLS_GD(rtype) && ((gnp = ld_find_got_ndx(sdp->sd_GOTndxs, diff --git a/usr/src/cmd/sgs/libld/common/machrel.sparc.c b/usr/src/cmd/sgs/libld/common/machrel.sparc.c index 02d180b1c2..93843960e4 100644 --- a/usr/src/cmd/sgs/libld/common/machrel.sparc.c +++ b/usr/src/cmd/sgs/libld/common/machrel.sparc.c @@ -1693,7 +1693,7 @@ ld_reloc_local(Rel_desc *rsp, Ofl_desc *ofl) /* * Perform relocation. */ - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); } /* @@ -1777,7 +1777,7 @@ ld_reloc_TLS(Boolean local, Rel_desc *rsp, Ofl_desc *ofl) if (ld_assign_got_TLS(local, rsp, ofl, sdp, gnp, GOT_REF_TLSIE, FLG_REL_STLS, - rtype, M_R_TPOFF, NULL) == S_ERROR) + rtype, M_R_TPOFF, 0) == S_ERROR) return (S_ERROR); } diff --git a/usr/src/cmd/sgs/libld/common/relocate.c b/usr/src/cmd/sgs/libld/common/relocate.c index a1c30c5d56..27c9a5de7f 100644 --- a/usr/src/cmd/sgs/libld/common/relocate.c +++ b/usr/src/cmd/sgs/libld/common/relocate.c @@ -923,7 +923,7 @@ ld_reloc_GOT_relative(Boolean local, Rel_desc *rsp, Ofl_desc *ofl) /* * Perform relocation to GOT table entry. */ - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); } /* @@ -1002,7 +1002,7 @@ ld_reloc_plt(Rel_desc *rsp, Ofl_desc *ofl) rsp->rel_rtype = ortype; return (1); } else - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); } /* @@ -1043,14 +1043,14 @@ reloc_exec(Rel_desc *rsp, Ofl_desc *ofl) */ if ((sdp->sd_flags & FLG_SY_SPECSEC) && (sym->st_shndx == SHN_ABS)) { if ((ofl->ofl_flags1 & FLG_OF1_ABSEXEC) == 0) - return ((*ld_targ.t_mr.mr_add_outrel)(NULL, rsp, ofl)); + return ((*ld_targ.t_mr.mr_add_outrel)(0, rsp, ofl)); /* * If -zabsexec is set then promote the ABSOLUTE symbol to * current the current object and perform the relocation now. */ sdp->sd_ref = REF_REL_NEED; - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); } /* @@ -1064,9 +1064,9 @@ reloc_exec(Rel_desc *rsp, Ofl_desc *ofl) if ((ELF_ST_TYPE(sym->st_info) == STT_OBJECT) && (RELAUX_GET_OSDESC(rsp)->os_shdr->sh_flags & SHF_WRITE)) { if (sdp->sd_flags & FLG_SY_MVTOCOMM) - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); else - return ((*ld_targ.t_mr.mr_add_outrel)(NULL, rsp, ofl)); + return ((*ld_targ.t_mr.mr_add_outrel)(0, rsp, ofl)); } /* @@ -1083,7 +1083,7 @@ reloc_exec(Rel_desc *rsp, Ofl_desc *ofl) ELF_ST_TYPE(sym->st_info), 0, &inv_buf), rsp->rel_isdesc->is_file->ifl_name, ld_reloc_sym_name(rsp), sdp->sd_file->ifl_name); - return ((*ld_targ.t_mr.mr_add_outrel)(NULL, rsp, ofl)); + return ((*ld_targ.t_mr.mr_add_outrel)(0, rsp, ofl)); } /* @@ -1279,7 +1279,7 @@ reloc_exec(Rel_desc *rsp, Ofl_desc *ofl) DBG_CALL(Dbg_syms_copy_reloc(ofl, _sdp, _sdp->sd_sym->st_value)); } - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); } /* @@ -1302,12 +1302,12 @@ reloc_generic(Rel_desc *rsp, Ofl_desc *ofl) * until runtime. */ if (ofl->ofl_flags & FLG_OF_SHAROBJ) - return ((*ld_targ.t_mr.mr_add_outrel)(NULL, rsp, ofl)); + return ((*ld_targ.t_mr.mr_add_outrel)(0, rsp, ofl)); /* * Otherwise process relocation now. */ - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); } /* @@ -1321,7 +1321,7 @@ reloc_relobj(Boolean local, Rel_desc *rsp, Ofl_desc *ofl) Word rtype = rsp->rel_rtype; Sym_desc *sdp = rsp->rel_sym; Is_desc *isp = rsp->rel_isdesc; - Word oflags = NULL; + Word oflags = 0; /* * Determine if we can do any relocations at this point. We can if: @@ -1334,7 +1334,7 @@ reloc_relobj(Boolean local, Rel_desc *rsp, Ofl_desc *ofl) !IS_GOT_BASED(rtype) && !IS_GOT_PC(rtype) && IS_PC_RELATIVE(rtype) && ((sdp->sd_isc) && (sdp->sd_isc->is_osdesc == isp->is_osdesc))) - return (ld_add_actrel(NULL, rsp, ofl)); + return (ld_add_actrel(0, rsp, ofl)); /* * If -zredlocsym is in effect, translate all local symbol relocations @@ -1382,7 +1382,7 @@ reloc_relobj(Boolean local, Rel_desc *rsp, Ofl_desc *ofl) */ if ((ELF_ST_TYPE(sdp->sd_sym->st_info) == STT_SECTION) || (oflags == FLG_REL_SCNNDX)) - if (ld_add_actrel(NULL, rsp, ofl) == S_ERROR) + if (ld_add_actrel(0, rsp, ofl) == S_ERROR) return (S_ERROR); } return ((*ld_targ.t_mr.mr_add_outrel)(oflags, rsp, ofl)); @@ -1673,7 +1673,7 @@ ld_process_sym_reloc(Ofl_desc *ofl, Rel_desc *reld, Rel *reloc, Is_desc *isp, if ((sdp->sd_ref == REF_REL_NEED) || (flags & FLG_OF_BFLAG) || (flags & FLG_OF_SHAROBJ) || (ELF_ST_TYPE(sdp->sd_sym->st_info) == STT_NOTYPE)) - return ((*ld_targ.t_mr.mr_add_outrel)(NULL, reld, ofl)); + return ((*ld_targ.t_mr.mr_add_outrel)(0, reld, ofl)); if (sdp->sd_ref == REF_DYN_NEED) return (reloc_exec(reld, ofl)); diff --git a/usr/src/cmd/sgs/libld/common/sections.c b/usr/src/cmd/sgs/libld/common/sections.c index 696a18ec40..22b2655105 100644 --- a/usr/src/cmd/sgs/libld/common/sections.c +++ b/usr/src/cmd/sgs/libld/common/sections.c @@ -1695,7 +1695,7 @@ make_cap(Ofl_desc *ofl, Word shtype, const char *shname, int ident) } if (size == 0) - return (NULL); + return (0); if (new_section(ofl, shtype, shname, size, &isec, &shdr, &data) == S_ERROR) @@ -2380,7 +2380,7 @@ make_dynstr(Ofl_desc *ofl) (ELF_ST_BIND(sdp->sd_sym->st_info) != STB_LOCAL)) continue; - if (sdp->sd_sym->st_name == NULL) + if (sdp->sd_sym->st_name == 0) continue; if (st_insert(ofl->ofl_dynstrtab, sdp->sd_name) == -1) diff --git a/usr/src/cmd/sgs/libld/common/update.c b/usr/src/cmd/sgs/libld/common/update.c index ccd26beb5e..7626520cd7 100644 --- a/usr/src/cmd/sgs/libld/common/update.c +++ b/usr/src/cmd/sgs/libld/common/update.c @@ -207,7 +207,7 @@ update_osym(Ofl_desc *ofl) Word *symshndx = NULL; /* .symtab_shndx table */ Word *dynshndx = NULL; /* .dynsym_shndx table */ Word *ldynshndx = NULL; /* .SUNW_ldynsym_shndx table */ - Word ldynsym_cnt = NULL; /* number of items in */ + Word ldynsym_cnt = 0; /* number of items in */ /* .SUNW_ldynsym */ Str_tbl *shstrtab; Str_tbl *strtab; @@ -307,7 +307,7 @@ update_osym(Ofl_desc *ofl) if (!(flags & FLG_OF_NOVERSEC) && (flags & (FLG_OF_VERNEED | FLG_OF_VERDEF))) { versym = (Versym *)ofl->ofl_osversym->os_outdata->d_buf; - versym[0] = NULL; + versym[0] = 0; } else versym = NULL; @@ -1607,7 +1607,7 @@ update_osym(Ofl_desc *ofl) DBG_CALL(Dbg_syms_old(ofl, sdp)); - spec = NULL; + spec = 0; /* * assign new symbol value. */ diff --git a/usr/src/cmd/sgs/librtld_db/common/rd_elf.c b/usr/src/cmd/sgs/librtld_db/common/rd_elf.c index b3de685b81..c78d39e714 100644 --- a/usr/src/cmd/sgs/librtld_db/common/rd_elf.c +++ b/usr/src/cmd/sgs/librtld_db/common/rd_elf.c @@ -152,7 +152,7 @@ validate_rdebug32(struct rd_agent *rap) rd_err_e find_dynamic_ent32(struct rd_agent *rap, psaddr_t dynaddr, - Xword dyntag, Dyn *dyn) + Xword dyntag, Dyn *dyn) { struct ps_prochandle *php = rap->rd_psp; Dyn d; @@ -570,7 +570,7 @@ _rd_objpad_enable32(struct rd_agent *rap, size_t padsize) static rd_err_e iter_map(rd_agent_t *rap, unsigned long ident, psaddr_t lmaddr, - rl_iter_f *cb, void *client_data, uint_t *abort_iterp) + rl_iter_f *cb, void *client_data, uint_t *abort_iterp) { while (lmaddr) { Rt_map rmap; @@ -724,7 +724,7 @@ _rd_loadobj_iter32_native(rd_agent_t *rap, rl_iter_f *cb, void *client_data, return (RD_DBERR); } - if (db_priv.rtd_dynlmlst == NULL) { + if (db_priv.rtd_dynlmlst == 0) { LOG(ps_plog(MSG_ORIG(MSG_DB_LKMAPNOINIT), EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst))); return (RD_NOMAPS); @@ -737,7 +737,7 @@ _rd_loadobj_iter32_native(rd_agent_t *rap, rl_iter_f *cb, void *client_data, return (RD_DBERR); } - if (addr == NULL) { + if (addr == 0) { LOG(ps_plog(MSG_ORIG(MSG_DB_LKMAPNOINIT_1), EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst))); return (RD_NOMAPS); diff --git a/usr/src/cmd/sgs/mcs/common/file.c b/usr/src/cmd/sgs/mcs/common/file.c index 7fbf0af943..af6d7b8e0a 100644 --- a/usr/src/cmd/sgs/mcs/common/file.c +++ b/usr/src/cmd/sgs/mcs/common/file.c @@ -43,8 +43,8 @@ typedef struct { Seg_Table *b_e_seg_table; section_info_table *sec_table; int64_t *off_table; /* maintains section's offset; set to */ - /* retain old offset, else 0 */ - int64_t *nobits_table; /* maintains NOBITS sections */ + /* retain old offset, else 0 */ + int64_t *nobits_table; /* maintains NOBITS sections */ char *new_sec_string; } file_state_t; @@ -115,7 +115,7 @@ each_file(char *cur_file, Cmd_Info *cmd_info) artmpfile.tmp_name = tempnam(TMPDIR, "mcs2"); if ((fdartmp = open(artmpfile.tmp_name, O_WRONLY | O_APPEND | O_CREAT, - (mode_t)0666)) == NULL) { + (mode_t)0666)) == 0) { error_message(OPEN_TEMP_ERROR, SYSTEM_ERROR, strerror(errno), prog, artmpfile); @@ -313,17 +313,17 @@ static int traverse_file(Elf *elf, GElf_Ehdr * ehdr, char *cur_file, Cmd_Info *cmd_info, file_state_t *state) { - Elf_Scn * scn; - Elf_Scn * temp_scn; - Elf_Data * data; - GElf_Shdr * shdr; - char *temp_name; - section_info_table * sinfo; - GElf_Xword x; - int ret = 0, SYM = 0; /* used by strip command */ - int phnum = ehdr->e_phnum; - unsigned int i, scn_index; - size_t shstrndx, shnum; + Elf_Scn *scn; + Elf_Scn *temp_scn; + Elf_Data *data; + GElf_Shdr *shdr; + char *temp_name; + section_info_table *sinfo; + GElf_Xword x; + int ret = 0, SYM = 0; /* used by strip command */ + int phnum = ehdr->e_phnum; + unsigned int i, scn_index; + size_t shstrndx, shnum; state->Sect_exists = 0; @@ -716,7 +716,7 @@ build_file(Elf *src_elf, GElf_Ehdr *src_ehdr, Cmd_Info *cmd_info, return (FAILURE); } - if (gelf_newehdr(dst_elf, gelf_getclass(src_elf)) == NULL) { + if (gelf_newehdr(dst_elf, gelf_getclass(src_elf)) == 0) { error_message(LIBELF_ERROR, LIBelf_ERROR, elf_errmsg(-1), prog); return (FAILURE); } @@ -743,7 +743,7 @@ build_file(Elf *src_elf, GElf_Ehdr *src_ehdr, Cmd_Info *cmd_info, if (src_ehdr->e_phnum != 0) { (void) elf_flagelf(dst_elf, ELF_C_SET, ELF_F_LAYOUT); - if (gelf_newphdr(dst_elf, src_ehdr->e_phnum) == NULL) { + if (gelf_newphdr(dst_elf, src_ehdr->e_phnum) == 0) { error_message(LIBELF_ERROR, LIBelf_ERROR, elf_errmsg(-1), prog); return (FAILURE); @@ -1041,7 +1041,7 @@ build_file(Elf *src_elf, GElf_Ehdr *src_ehdr, Cmd_Info *cmd_info, dst_shdr.sh_type = SHT_PROGBITS; dst_shdr.sh_flags = 0; dst_shdr.sh_addr = 0; - if (src_ehdr->e_phnum != NULL) + if (src_ehdr->e_phnum != 0) dst_shdr.sh_offset = new_offset; else dst_shdr.sh_offset = 0; diff --git a/usr/src/cmd/sgs/mcs/common/utils.c b/usr/src/cmd/sgs/mcs/common/utils.c index 221fbab834..0016c27b25 100644 --- a/usr/src/cmd/sgs/mcs/common/utils.c +++ b/usr/src/cmd/sgs/mcs/common/utils.c @@ -466,7 +466,7 @@ compress(char *str, size_t *size) mcs_exit(FAILURE); } } - strings[next_str++] = NULL; + strings[next_str++] = '\0'; /* * End get string */ @@ -528,7 +528,7 @@ dohash(char *str) unsigned shift; int t; sum = 1; - for (shift = 0; (t = *str++) != NULL; shift += 7) { + for (shift = 0; (t = *str++) != 0; shift += 7) { sum += (long)t << (shift %= HALFLONG); } sum = low(sum) + high(sum); diff --git a/usr/src/lib/libadm/common/ckdate.c b/usr/src/lib/libadm/common/ckdate.c index 9ae38509e1..43b5582ed6 100644 --- a/usr/src/lib/libadm/common/ckdate.c +++ b/usr/src/lib/libadm/common/ckdate.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* @@ -299,7 +299,7 @@ int ckdate_val(char *fmt, char *input) { char ltrl, dfl; - int valid = 1; /* time of day string is valid for format */ + int valid = 1; /* time of day string is valid for format */ if ((fmt != NULL) && (fmtcheck(fmt) == 1)) return (4); @@ -392,9 +392,8 @@ ckdate_val(char *fmt, char *input) fmt++; } /* end of while fmt and valid */ - if ((*fmt == NULL) && ((input != NULL) && *input != 0)) { - if (*input != NULL) - valid = 0; + if ((*fmt == '\0') && ((input != NULL) && *input != '\0')) { + valid = 0; } return ((valid == 0)); } diff --git a/usr/src/lib/libadm/common/pkgparam.c b/usr/src/lib/libadm/common/pkgparam.c index cd7cacfd27..393298f29f 100644 --- a/usr/src/lib/libadm/common/pkgparam.c +++ b/usr/src/lib/libadm/common/pkgparam.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. @@ -52,7 +52,7 @@ #define ESCAPE '\\' static char sepset[] = ":=\n"; -static char qset[] = "'\""; +static char qset[] = "'\""; static char *pkg_inst_root = NULL; char *pkgdir = NULL; @@ -368,8 +368,8 @@ pkgparam(char *pkg, char *param) } if (pt = fpkgparam(fp, param)) { - if (strcmp(param, "ARCH") == NULL || - strcmp(param, "CATEGORY") == NULL) { + if (strcmp(param, "ARCH") == 0 || + strcmp(param, "CATEGORY") == 0) { /* remove all whitespace from value */ value = copy = pt; while (*value) { @@ -411,7 +411,7 @@ set_PKGpaths(char *path) char * get_PKGLOC(void) { - if (Adm_pkgloc[0] == NULL) + if (Adm_pkgloc[0] == '\0') return (PKGLOC); else return (Adm_pkgloc); @@ -420,7 +420,7 @@ get_PKGLOC(void) char * get_PKGADM(void) { - if (Adm_pkgadm[0] == NULL) + if (Adm_pkgadm[0] == '\0') return (PKGADM); else return (Adm_pkgadm); diff --git a/usr/src/lib/libcpc/common/libcpc.c b/usr/src/lib/libcpc/common/libcpc.c index de6c13d33c..9e8cb62d9c 100644 --- a/usr/src/lib/libcpc/common/libcpc.c +++ b/usr/src/lib/libcpc/common/libcpc.c @@ -203,7 +203,7 @@ cpc_set_create(cpc_t *cpc) set->cs_fd = -1; set->cs_pctx = NULL; set->cs_id = -1; - set->cs_thr = NULL; + set->cs_thr = 0; sigblocked = cpc_lock(cpc); set->cs_next = cpc->cpc_sets; @@ -617,7 +617,7 @@ cpc_unbind(cpc_t *cpc, cpc_set_t *set) break; } - set->cs_thr = NULL; + set->cs_thr = 0; set->cs_id = -1; set->cs_state = CS_UNBOUND; if (ret != 0) @@ -781,7 +781,7 @@ cpc_get_list(int which, int arg) void cpc_walk_requests(cpc_t *cpc, cpc_set_t *set, void *arg, void (*action)(void *arg, int index, const char *event, uint64_t preset, - uint_t flags, int nattrs, const cpc_attr_t *attrs)) + uint_t flags, int nattrs, const cpc_attr_t *attrs)) { cpc_request_t *rp; cpc_attr_t *attrs = NULL; @@ -871,7 +871,7 @@ err: /*ARGSUSED*/ void cpc_walk_events_all(cpc_t *cpc, void *arg, - void (*action)(void *arg, const char *event)) + void (*action)(void *arg, const char *event)) { cpc_walk_events_impl(cpc, arg, action, 0); } @@ -880,7 +880,7 @@ cpc_walk_events_all(cpc_t *cpc, void *arg, /*ARGSUSED*/ void cpc_walk_generic_events_all(cpc_t *cpc, void *arg, - void (*action)(void *arg, const char *event)) + void (*action)(void *arg, const char *event)) { cpc_walk_events_impl(cpc, arg, action, 1); } diff --git a/usr/src/lib/libdevinfo/devfsinfo.c b/usr/src/lib/libdevinfo/devfsinfo.c index d6f8407ebb..4aee4285ae 100644 --- a/usr/src/lib/libdevinfo/devfsinfo.c +++ b/usr/src/lib/libdevinfo/devfsinfo.c @@ -491,7 +491,7 @@ devfs_bootdev_set_list(const char *dev_name, const uint_t options) i++; } ptr--; - *ptr = NULL; + *ptr = 0; prom_list_free(prom_list); } @@ -835,7 +835,7 @@ find_x86_boot_device(struct openpromio *opp) */ int devfs_bootdev_get_list(const char *default_root, - struct boot_dev ***bootdev_list) + struct boot_dev ***bootdev_list) { Oppbuf oppbuf; struct openpromio *opp = &(oppbuf.opp); @@ -877,7 +877,7 @@ devfs_bootdev_get_list(const char *default_root, */ static int process_bootdev(const char *bootdevice, const char *default_root, - struct boot_dev ***list) + struct boot_dev ***list) { int i; char *entry, *ptr; @@ -1202,7 +1202,7 @@ devfs_phys_to_logical(struct boot_dev **bootdev_array, const int array_size, /* ARGSUSED */ static int check_logical_dev(const char *node, const struct stat *node_stat, int flags, - struct FTW *ftw_info) + struct FTW *ftw_info) { char link_buf[MAXPATHLEN]; int link_buf_len; @@ -1352,7 +1352,7 @@ devfs_dev_to_prom_names(char *dev_path, char *prom_path, size_t len) i = len - opp->oprom_size; if (i < 0) { bcopy(opp->oprom_array, prom_path, len); - prom_path[len - 1] = NULL; + prom_path[len - 1] = '\0'; return (len); } else { bcopy(opp->oprom_array, prom_path, len); diff --git a/usr/src/lib/libdevinfo/devinfo.c b/usr/src/lib/libdevinfo/devinfo.c index 678f891c90..476c9a2e43 100644 --- a/usr/src/lib/libdevinfo/devinfo.c +++ b/usr/src/lib/libdevinfo/devinfo.c @@ -147,7 +147,7 @@ di_init_driver(const char *drv_name, uint_t flag) di_node_t di_init_impl(const char *phys_path, uint_t flag, - struct di_priv_data *priv) + struct di_priv_data *priv) { caddr_t pa; int fd, map_size; @@ -467,7 +467,7 @@ di_drv_next_node(di_node_t node) pa = (caddr_t)node - DI_NODE(node)->self; - if (DI_NODE(node)->next == NULL) { + if (DI_NODE(node)->next == 0) { errno = ENXIO; return (DI_NODE_NIL); } @@ -770,7 +770,7 @@ update_node_list(int action, uint_t flag, struct node_list **headp) */ static void walk_one_node(struct node_list **headp, uint_t flag, void *arg, - int (*callback)(di_node_t, void *)) + int (*callback)(di_node_t, void *)) { DPRINTF((DI_TRACE, "Walking node %s\n", di_node_name((*headp)->node))); @@ -780,7 +780,7 @@ walk_one_node(struct node_list **headp, uint_t flag, void *arg, int di_walk_node(di_node_t root, uint_t flag, void *arg, - int (*node_callback)(di_node_t, void *)) + int (*node_callback)(di_node_t, void *)) { struct node_list *head; /* node_list for tree walk */ @@ -816,7 +816,7 @@ di_walk_node(di_node_t root, uint_t flag, void *arg, */ static void walk_one_minor_list(struct node_list **headp, const char *desired_type, - uint_t flag, void *arg, int (*callback)(di_node_t, di_minor_t, void *)) + uint_t flag, void *arg, int (*callback)(di_node_t, di_minor_t, void *)) { int ddm_type; int action = DI_WALK_CONTINUE; @@ -851,7 +851,7 @@ walk_one_minor_list(struct node_list **headp, const char *desired_type, int di_walk_minor(di_node_t root, const char *minor_type, uint_t flag, void *arg, - int (*minor_callback)(di_node_t, di_minor_t, void *)) + int (*minor_callback)(di_node_t, di_minor_t, void *)) { struct node_list *head; /* node_list for tree walk */ @@ -1709,7 +1709,7 @@ di_prop_find(dev_t match_dev, di_node_t node, const char *name) int di_prop_lookup_ints(dev_t dev, di_node_t node, const char *prop_name, - int **prop_data) + int **prop_data) { di_prop_t prop; @@ -1722,7 +1722,7 @@ di_prop_lookup_ints(dev_t dev, di_node_t node, const char *prop_name, int di_prop_lookup_int64(dev_t dev, di_node_t node, const char *prop_name, - int64_t **prop_data) + int64_t **prop_data) { di_prop_t prop; @@ -1748,7 +1748,7 @@ di_prop_lookup_strings(dev_t dev, di_node_t node, const char *prop_name, int di_prop_lookup_bytes(dev_t dev, di_node_t node, const char *prop_name, - uchar_t **prop_data) + uchar_t **prop_data) { di_prop_t prop; @@ -2376,7 +2376,7 @@ di_vhci_first_node(di_node_t root) pa = (caddr_t)root - DI_NODE(root)->self; dap = DI_ALL(pa); - if (dap->top_vhci_devinfo == NULL) { + if (dap->top_vhci_devinfo == 0) { errno = ENXIO; return (DI_NODE_NIL); } @@ -2397,7 +2397,7 @@ di_vhci_next_node(di_node_t node) DPRINTF((DI_TRACE, "next vhci node on the snap shot:" " current=%s\n", di_node_name(node))); - if (DI_NODE(node)->next_vhci == NULL) { + if (DI_NODE(node)->next_vhci == 0) { errno = ENXIO; return (DI_NODE_NIL); } @@ -2425,7 +2425,7 @@ di_phci_first_node(di_node_t vhci_node) pa = (caddr_t)vhci_node - DI_NODE(vhci_node)->self; - if (DI_NODE(vhci_node)->top_phci == NULL) { + if (DI_NODE(vhci_node)->top_phci == 0) { errno = ENXIO; return (DI_NODE_NIL); } @@ -2446,7 +2446,7 @@ di_phci_next_node(di_node_t node) DPRINTF((DI_TRACE, "next phci node on the snap shot:" " current=%s\n", di_node_name(node))); - if (DI_NODE(node)->next_phci == NULL) { + if (DI_NODE(node)->next_phci == 0) { errno = ENXIO; return (DI_NODE_NIL); } @@ -2535,7 +2535,7 @@ typedef struct { static int di_walk_hp_callback(di_node_t node, void *argp) { - di_walk_hp_arg_t *arg = (di_walk_hp_arg_t *)argp; + di_walk_hp_arg_t *arg = (di_walk_hp_arg_t *)argp; di_hp_t hp; char *type_str; @@ -2890,7 +2890,7 @@ di_prom_fini(di_prom_handle_t ph) */ static di_prom_prop_t di_prom_prop_found(di_prom_handle_t ph, int nodeid, - di_prom_prop_t prom_prop) + di_prom_prop_t prom_prop) { struct di_prom_handle *p = (struct di_prom_handle *)ph; struct openpromio *opp = &p->oppbuf.opp; @@ -3028,7 +3028,7 @@ di_prom_prop_data(di_prom_prop_t prom_prop, uchar_t **prom_prop_data) */ if (prom_prop == DI_PROM_PROP_NIL) { errno = EINVAL; - return (NULL); + return (0); } *prom_prop_data = ((struct di_prom_prop *)prom_prop)->data; @@ -3042,7 +3042,7 @@ di_prom_prop_data(di_prom_prop_t prom_prop, uchar_t **prom_prop_data) */ static struct di_prom_prop * di_prom_prop_lookup_common(di_prom_handle_t ph, di_node_t node, - const char *prom_prop_name) + const char *prom_prop_name) { struct openpromio *opp; struct di_prom_prop *prop; @@ -3142,7 +3142,7 @@ di_prom_prop_lookup_common(di_prom_handle_t ph, di_node_t node, int di_prom_prop_lookup_ints(di_prom_handle_t ph, di_node_t node, - const char *prom_prop_name, int **prom_prop_data) + const char *prom_prop_name, int **prom_prop_data) { int len; struct di_prom_prop *prop; @@ -3168,7 +3168,7 @@ di_prom_prop_lookup_ints(di_prom_handle_t ph, di_node_t node, int di_prom_prop_lookup_strings(di_prom_handle_t ph, di_node_t node, - const char *prom_prop_name, char **prom_prop_data) + const char *prom_prop_name, char **prom_prop_data) { int len; struct di_prom_prop *prop; @@ -3211,7 +3211,7 @@ di_prom_prop_lookup_strings(di_prom_handle_t ph, di_node_t node, int di_prom_prop_lookup_bytes(di_prom_handle_t ph, di_node_t node, - const char *prom_prop_name, uchar_t **prom_prop_data) + const char *prom_prop_name, uchar_t **prom_prop_data) { int len; struct di_prom_prop *prop; @@ -3460,11 +3460,11 @@ di_lnode_next(di_node_t node, di_lnode_t lnode) di_all = DI_ALL((caddr_t)node - DI_NODE(node)->self); if (lnode == DI_NODE_NIL) { - if (DI_NODE(node)->lnodes != NULL) + if (DI_NODE(node)->lnodes != 0) return (DI_LNODE((caddr_t)di_all + DI_NODE(node)->lnodes)); } else { - if (DI_LNODE(lnode)->node_next != NULL) + if (DI_LNODE(lnode)->node_next != 0) return (DI_LNODE((caddr_t)di_all + DI_LNODE(lnode)->node_next)); } @@ -3495,21 +3495,21 @@ di_link_next_by_node(di_node_t node, di_link_t link, uint_t endpoint) if (endpoint == DI_LINK_SRC) { if (link == DI_LINK_NIL) { - if (DI_NODE(node)->src_links != NULL) + if (DI_NODE(node)->src_links != 0) return (DI_LINK((caddr_t)di_all + DI_NODE(node)->src_links)); } else { - if (DI_LINK(link)->src_node_next != NULL) + if (DI_LINK(link)->src_node_next != 0) return (DI_LINK((caddr_t)di_all + DI_LINK(link)->src_node_next)); } } else { if (link == DI_LINK_NIL) { - if (DI_NODE(node)->tgt_links != NULL) + if (DI_NODE(node)->tgt_links != 0) return (DI_LINK((caddr_t)di_all + DI_NODE(node)->tgt_links)); } else { - if (DI_LINK(link)->tgt_node_next != NULL) + if (DI_LINK(link)->tgt_node_next != 0) return (DI_LINK((caddr_t)di_all + DI_LINK(link)->tgt_node_next)); } @@ -3541,24 +3541,24 @@ di_link_next_by_lnode(di_lnode_t lnode, di_link_t link, uint_t endpoint) if (endpoint == DI_LINK_SRC) { if (link == DI_LINK_NIL) { - if (DI_LNODE(lnode)->link_out == NULL) + if (DI_LNODE(lnode)->link_out == 0) return (DI_LINK_NIL); return (DI_LINK((caddr_t)di_all + DI_LNODE(lnode)->link_out)); } else { - if (DI_LINK(link)->src_link_next == NULL) + if (DI_LINK(link)->src_link_next == 0) return (DI_LINK_NIL); return (DI_LINK((caddr_t)di_all + DI_LINK(link)->src_link_next)); } } else { if (link == DI_LINK_NIL) { - if (DI_LNODE(lnode)->link_in == NULL) + if (DI_LNODE(lnode)->link_in == 0) return (DI_LINK_NIL); return (DI_LINK((caddr_t)di_all + DI_LNODE(lnode)->link_in)); } else { - if (DI_LINK(link)->tgt_link_next == NULL) + if (DI_LINK(link)->tgt_link_next == 0) return (DI_LINK_NIL); return (DI_LINK((caddr_t)di_all + DI_LINK(link)->tgt_link_next)); diff --git a/usr/src/lib/libdevinfo/devinfo_devperm.c b/usr/src/lib/libdevinfo/devinfo_devperm.c index b335150f97..b2eb13f502 100644 --- a/usr/src/lib/libdevinfo/devinfo_devperm.c +++ b/usr/src/lib/libdevinfo/devinfo_devperm.c @@ -676,7 +676,7 @@ getnexttoken(char *next, char **nextp, char **tokenpp, char *tchar) ; if (*cp1 == '=' || *cp1 == ':' || *cp1 == '&' || *cp1 == '|' || *cp1 == ';' || *cp1 == '\n' || *cp1 == '\0') { - *cp = NULL; /* terminate token */ + *cp = '\0'; /* terminate token */ cp = cp1; } } @@ -959,7 +959,7 @@ devfs_read_minor_perm(void (*errcb)(minorperm_err_t, int)) static struct mperm * i_devfs_read_minor_perm_by_driver(char *drvname, - void (*errcb)(minorperm_err_t mp_err, int key)) + void (*errcb)(minorperm_err_t mp_err, int key)) { return (i_devfs_read_minor_perm(drvname, errcb)); } @@ -1010,7 +1010,7 @@ i_devfs_add_perm_entry(nvlist_t *nvl, struct mperm *mp) static nvlist_t * i_devfs_minor_perm_nvlist(struct mperm *mplist, - void (*errcb)(minorperm_err_t, int)) + void (*errcb)(minorperm_err_t, int)) { int err; struct mperm *mp; @@ -1037,8 +1037,7 @@ i_devfs_minor_perm_nvlist(struct mperm *mplist, * Done at boot time via devfsadm */ int -devfs_load_minor_perm(struct mperm *mplist, - void (*errcb)(minorperm_err_t, int)) +devfs_load_minor_perm(struct mperm *mplist, void (*errcb)(minorperm_err_t, int)) { int err; char *buf = NULL; @@ -1066,7 +1065,7 @@ devfs_load_minor_perm(struct mperm *mplist, */ static int i_devfs_update_minor_perm(char *drv, int ctl, - void (*errcb)(minorperm_err_t, int)) + void (*errcb)(minorperm_err_t, int)) { int err; char *buf; @@ -1095,15 +1094,13 @@ i_devfs_update_minor_perm(char *drv, int ctl, } int -devfs_add_minor_perm(char *drv, - void (*errcb)(minorperm_err_t, int)) +devfs_add_minor_perm(char *drv, void (*errcb)(minorperm_err_t, int)) { return (i_devfs_update_minor_perm(drv, MODADDMINORPERM, errcb)); } int -devfs_rm_minor_perm(char *drv, - void (*errcb)(minorperm_err_t, int)) +devfs_rm_minor_perm(char *drv, void (*errcb)(minorperm_err_t, int)) { return (i_devfs_update_minor_perm(drv, MODREMMINORPERM, errcb)); } diff --git a/usr/src/lib/libdladm/common/flowprop.c b/usr/src/lib/libdladm/common/flowprop.c index a0531c8439..6ac9c96be7 100644 --- a/usr/src/lib/libdladm/common/flowprop.c +++ b/usr/src/lib/libdladm/common/flowprop.c @@ -61,7 +61,7 @@ static fpd_setf_t do_set_priority; static fpd_checkf_t do_check_priority; static fprop_desc_t prop_table[] = { - { "maxbw", { "", NULL }, NULL, 0, B_FALSE, + { "maxbw", { "", 0 }, NULL, 0, B_FALSE, do_set_maxbw, NULL, do_get_maxbw, do_check_maxbw}, { "priority", { "", MPL_RESET }, NULL, 0, B_FALSE, @@ -266,7 +266,7 @@ do_get_maxbw(dladm_handle_t handle, const char *flow, char **prop_val, uint_t *val_cnt) { mac_resource_props_t *mrp; - char buf[DLADM_STRSIZE]; + char buf[DLADM_STRSIZE]; dladm_flow_attr_t fa; dladm_status_t status; @@ -360,7 +360,7 @@ do_get_priority(dladm_handle_t handle, const char *flow, char **prop_val, uint_t *val_cnt) { mac_resource_props_t *mrp; - char buf[DLADM_STRSIZE]; + char buf[DLADM_STRSIZE]; dladm_flow_attr_t fa; dladm_status_t status; diff --git a/usr/src/lib/libdladm/common/libdlmgmt.c b/usr/src/lib/libdladm/common/libdlmgmt.c index b5d7aadb4f..8f999d8b9c 100644 --- a/usr/src/lib/libdladm/common/libdlmgmt.c +++ b/usr/src/lib/libdladm/common/libdlmgmt.c @@ -277,7 +277,7 @@ dladm_walk_datalink_id(int (*fn)(dladm_handle_t, datalink_id_t, void *), { dlmgmt_door_getnext_t getnext; dlmgmt_getnext_retval_t retval; - uint32_t dlmgmt_flags; + uint32_t dlmgmt_flags; datalink_id_t linkid = DATALINK_INVALID_LINKID; dladm_status_t status = DLADM_STATUS_OK; size_t sz = sizeof (retval); @@ -517,7 +517,7 @@ dladm_getnext_conf_linkprop(dladm_handle_t handle, dladm_conf_t conf, return (DLADM_STATUS_NOTFOUND); if ((err = nvpair_value_byte_array(nvp, (uchar_t **)&oattrval, - &oattrsz)) != NULL) { + &oattrsz)) != 0) { return (dladm_errno2status(err)); } diff --git a/usr/src/lib/libdladm/common/libdlwlan.c b/usr/src/lib/libdladm/common/libdlwlan.c index 0593ae3cfc..59e1261dd2 100644 --- a/usr/src/lib/libdladm/common/libdlwlan.c +++ b/usr/src/lib/libdladm/common/libdlwlan.c @@ -47,23 +47,23 @@ static dladm_status_t wpa_instance_create(dladm_handle_t, datalink_id_t, void *); static dladm_status_t wpa_instance_delete(dladm_handle_t, datalink_id_t); -static dladm_status_t do_get_bsstype(dladm_handle_t, datalink_id_t, void *, +static dladm_status_t do_get_bsstype(dladm_handle_t, datalink_id_t, void *, int); -static dladm_status_t do_get_essid(dladm_handle_t, datalink_id_t, void *, +static dladm_status_t do_get_essid(dladm_handle_t, datalink_id_t, void *, int); -static dladm_status_t do_get_bssid(dladm_handle_t, datalink_id_t, void *, +static dladm_status_t do_get_bssid(dladm_handle_t, datalink_id_t, void *, int); -static dladm_status_t do_get_signal(dladm_handle_t, datalink_id_t, void *, +static dladm_status_t do_get_signal(dladm_handle_t, datalink_id_t, void *, int); -static dladm_status_t do_get_encryption(dladm_handle_t, datalink_id_t, void *, +static dladm_status_t do_get_encryption(dladm_handle_t, datalink_id_t, void *, int); -static dladm_status_t do_get_authmode(dladm_handle_t, datalink_id_t, void *, +static dladm_status_t do_get_authmode(dladm_handle_t, datalink_id_t, void *, int); -static dladm_status_t do_get_linkstatus(dladm_handle_t, datalink_id_t, void *, +static dladm_status_t do_get_linkstatus(dladm_handle_t, datalink_id_t, void *, int); static dladm_status_t do_get_esslist(dladm_handle_t, datalink_id_t, void *, int); -static dladm_status_t do_get_rate(dladm_handle_t, datalink_id_t, void *, int); +static dladm_status_t do_get_rate(dladm_handle_t, datalink_id_t, void *, int); static dladm_status_t do_get_mode(dladm_handle_t, datalink_id_t, void *, int); static dladm_status_t do_get_capability(dladm_handle_t, datalink_id_t, void *, int); @@ -104,13 +104,13 @@ static val_desc_t linkstatus_vals[] = { { "connected", DLADM_WLAN_LINK_CONNECTED } }; -static val_desc_t secmode_vals[] = { +static val_desc_t secmode_vals[] = { { "none", DLADM_WLAN_SECMODE_NONE }, { "wep", DLADM_WLAN_SECMODE_WEP }, { "wpa", DLADM_WLAN_SECMODE_WPA } }; -static val_desc_t strength_vals[] = { +static val_desc_t strength_vals[] = { { "very weak", DLADM_WLAN_STRENGTH_VERY_WEAK }, { "weak", DLADM_WLAN_STRENGTH_WEAK }, { "good", DLADM_WLAN_STRENGTH_GOOD }, @@ -263,7 +263,7 @@ dladm_wlan_scan(dladm_handle_t handle, datalink_id_t linkid, void *arg, uint32_t count; wl_ess_conf_t *wlp; wl_ess_list_t *wls = NULL; - char buf[WLDP_BUFSIZE]; + char buf[WLDP_BUFSIZE]; wl_linkstatus_t wl_status; dladm_wlan_attr_t wlattr; dladm_status_t status; @@ -558,8 +558,8 @@ dladm_wlan_connect(dladm_handle_t handle, datalink_id_t linkid, uint_t flags) { int i; - char buf[WLDP_BUFSIZE]; - connect_state_t state = {0, NULL, NULL}; + char buf[WLDP_BUFSIZE]; + connect_state_t state = {0, 0, NULL}; attr_node_t *nodep = NULL; boolean_t create_ibss, set_authmode; dladm_wlan_attr_t **wl_list = NULL; diff --git a/usr/src/lib/libdladm/common/linkprop.c b/usr/src/lib/libdladm/common/linkprop.c index 0afd4d8bce..703fca8d4e 100644 --- a/usr/src/lib/libdladm/common/linkprop.c +++ b/usr/src/lib/libdladm/common/linkprop.c @@ -71,7 +71,7 @@ /* * The linkprop get() callback. - * - pd: pointer to the prop_desc_t + * - pd: pointer to the prop_desc_t * - propstrp: a property string array to keep the returned property. * Caller allocated. * - cntp: number of returned properties. @@ -88,7 +88,7 @@ typedef dladm_status_t pd_getf_t(dladm_handle_t, prop_desc_t *pdp, * The linkprop set() callback. * - propval: a val_desc_t array which keeps the property values to be set. * - cnt: number of properties to be set. - * - flags: additional flags passed down the system call. + * - flags: additional flags passed down the system call. * * pd_set takes val_desc_t given by pd_check(), translates it into * a format suitable for kernel consumption. This may require allocation @@ -416,8 +416,8 @@ static const bridge_public_prop_t bridge_prop[] = { }; static val_desc_t link_duplex_vals[] = { - { "half", LINK_DUPLEX_HALF }, - { "full", LINK_DUPLEX_HALF } + { "half", LINK_DUPLEX_HALF }, + { "full", LINK_DUPLEX_HALF } }; static val_desc_t link_status_vals[] = { { "up", LINK_STATE_UP }, @@ -2686,7 +2686,7 @@ check_allowedips(dladm_handle_t handle, prop_desc_t *pdp, fail: for (i = 0; i < val_cnt; i++) { free((void *)vdp[i].vd_val); - vdp[i].vd_val = NULL; + vdp[i].vd_val = 0; } return (status); } @@ -3109,7 +3109,7 @@ check_allowedcids(dladm_handle_t handle, prop_desc_t *pdp, fail: for (i = 0; i < val_cnt; i++) { free((void *)vdp[i].vd_val); - vdp[i].vd_val = NULL; + vdp[i].vd_val = 0; } return (status); } @@ -3177,7 +3177,7 @@ check_secondary_macs(dladm_handle_t handle, prop_desc_t *pdp, fail: for (i = 0; i < val_cnt; i++) { free((void *)vdp[i].vd_val); - vdp[i].vd_val = NULL; + vdp[i].vd_val = 0; } return (status); } @@ -3476,7 +3476,7 @@ check_rate(dladm_handle_t handle, prop_desc_t *pdp, datalink_id_t linkid, uint_t modval_cnt = MAX_SUPPORT_RATES; char *buf, **modval; dladm_status_t status; - uint_t perm_flags; + uint_t perm_flags; uint_t val_cnt = *val_cntp; val_desc_t *vdp = *vdpp; @@ -4277,9 +4277,9 @@ i_dladm_set_private_prop(dladm_handle_t handle, datalink_id_t linkid, const char *prop_name, char **prop_val, uint_t val_cnt, uint_t flags) { int i, slen; - int bufsize = 0; + int bufsize = 0; dld_ioc_macprop_t *dip = NULL; - uchar_t *dp; + uchar_t *dp; link_attr_t *p; dladm_status_t status = DLADM_STATUS_OK; diff --git a/usr/src/lib/libdtrace/common/dt_consume.c b/usr/src/lib/libdtrace/common/dt_consume.c index 549abb2e75..807d60a79a 100644 --- a/usr/src/lib/libdtrace/common/dt_consume.c +++ b/usr/src/lib/libdtrace/common/dt_consume.c @@ -1277,7 +1277,7 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format, return (dt_set_errno(dtp, EDT_BADSTACKPC)); } - if (pc == NULL) + if (pc == 0) break; addr += size; @@ -1365,7 +1365,7 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format, if (P != NULL) dt_proc_lock(dtp, P); /* lock handle while we perform lookups */ - for (i = 0; i < depth && pc[i] != NULL; i++) { + for (i = 0; i < depth && pc[i] != 0; i++) { const prmap_t *map; if ((err = dt_printf(dtp, fp, "%*s", indent, "")) < 0) diff --git a/usr/src/lib/libdtrace/common/dt_handle.c b/usr/src/lib/libdtrace/common/dt_handle.c index 9d27aee4de..49b7f22cf7 100644 --- a/usr/src/lib/libdtrace/common/dt_handle.c +++ b/usr/src/lib/libdtrace/common/dt_handle.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stddef.h> #include <stdlib.h> #include <strings.h> @@ -247,7 +245,7 @@ dt_handle_liberr(dtrace_hdl_t *dtp, const dtrace_probedata_t *data, err.dteda_action = -1; err.dteda_offset = -1; err.dteda_fault = DTRACEFLT_LIBRARY; - err.dteda_addr = NULL; + err.dteda_addr = 0; len = strlen(faultstr) + strlen(errpd->dtpd_provider) + strlen(errpd->dtpd_mod) + diff --git a/usr/src/lib/libdtrace/common/dt_map.c b/usr/src/lib/libdtrace/common/dt_map.c index 8a3ce817e4..16e3525b1e 100644 --- a/usr/src/lib/libdtrace/common/dt_map.c +++ b/usr/src/lib/libdtrace/common/dt_map.c @@ -384,7 +384,7 @@ dt_aggid_add(dtrace_hdl_t *dtp, dtrace_aggid_t id) * provide the compiler-generated aggregation information. */ if (dtp->dt_options[DTRACEOPT_GRABANON] == DTRACEOPT_UNSET && - agg->dtagd_rec[0].dtrd_uarg != NULL) { + agg->dtagd_rec[0].dtrd_uarg != 0) { dtrace_stmtdesc_t *sdp; dt_ident_t *aid; diff --git a/usr/src/lib/libdtrace/common/dt_module.c b/usr/src/lib/libdtrace/common/dt_module.c index 4c9a7ce66b..be83e44938 100644 --- a/usr/src/lib/libdtrace/common/dt_module.c +++ b/usr/src/lib/libdtrace/common/dt_module.c @@ -906,11 +906,11 @@ dt_module_unload(dtrace_hdl_t *dtp, dt_module_t *dmp) dmp->dm_asrsv = 0; dmp->dm_aslen = 0; - dmp->dm_text_va = NULL; + dmp->dm_text_va = 0; dmp->dm_text_size = 0; - dmp->dm_data_va = NULL; + dmp->dm_data_va = 0; dmp->dm_data_size = 0; - dmp->dm_bss_va = NULL; + dmp->dm_bss_va = 0; dmp->dm_bss_size = 0; if (dmp->dm_extern != NULL) { diff --git a/usr/src/lib/libpcidb/common/pcidb.c b/usr/src/lib/libpcidb/common/pcidb.c index 2d3babec90..ec1e8526d6 100644 --- a/usr/src/lib/libpcidb/common/pcidb.c +++ b/usr/src/lib/libpcidb/common/pcidb.c @@ -90,7 +90,7 @@ struct pcidb_device { struct pcidb_vendor { uint16_t pv_id; - char pv_name[PCI_NAME_MAX]; + char pv_name[PCI_NAME_MAX]; struct pcidb_device *pv_dstart; struct pcidb_device *pv_dend; struct pcidb_vendor *pv_prev; @@ -278,7 +278,7 @@ newstate: case PDB_VENDOR: v = parse_vendor(buf, hdl); if (v == NULL) - return (NULL); + return (0); state = PDB_DEVICE; continue; case PDB_DEVICE: @@ -295,7 +295,7 @@ newstate: assert(v != NULL); d = parse_device(buf, v); if (d == NULL) - return (NULL); + return (0); continue; case PDB_SUBDEV: if (buf[0] != '\t') { diff --git a/usr/src/lib/libpkg/common/devtype.c b/usr/src/lib/libpkg/common/devtype.c index e087966f86..318e4507bc 100644 --- a/usr/src/lib/libpkg/common/devtype.c +++ b/usr/src/lib/libpkg/common/devtype.c @@ -36,7 +36,7 @@ #include "pkgdev.h" #include "pkglib.h" -extern char *devattr(char *device, char *attribute); /* libadm.a */ +extern char *devattr(char *device, char *attribute); /* libadm.a */ int devtype(char *alias, struct pkgdev *devp) @@ -59,7 +59,7 @@ devtype(char *alias, struct pkgdev *devp) /* see if alias represents a mountable device (e.g., a floppy) */ if ((devp->mount = devattr(alias, "mountpt")) != NULL && - devp->mount[0] != NULL) { + devp->mount[0] != '\0') { devp->bdevice = devattr(alias, "bdevice"); if (!devp->bdevice || !devp->bdevice[0]) { if (devp->bdevice) { diff --git a/usr/src/lib/libpkg/common/dstream.c b/usr/src/lib/libpkg/common/dstream.c index 6622b74361..d2844d877b 100644 --- a/usr/src/lib/libpkg/common/dstream.c +++ b/usr/src/lib/libpkg/common/dstream.c @@ -91,7 +91,7 @@ struct dstoc { #define ds_nparts ds_toc->nparts #define ds_maxsiz ds_toc->maxsiz -int ds_totread; /* total number of parts read */ +int ds_totread; /* total number of parts read */ int ds_fd = -1; int ds_curpartcnt = -1; @@ -100,16 +100,16 @@ int ds_ginit(char *device); int ds_close(int pkgendflg); static FILE *ds_pp; -static int ds_realfd = -1; /* file descriptor for real device */ -static int ds_read; /* number of parts read for current package */ -static int ds_volno; /* volume number of current volume */ -static int ds_volcnt; /* total number of volumes */ -static char ds_volnos[128]; /* parts/volume info */ +static int ds_realfd = -1; /* file descriptor for real device */ +static int ds_read; /* number of parts read for current package */ +static int ds_volno; /* volume number of current volume */ +static int ds_volcnt; /* total number of volumes */ +static char ds_volnos[128]; /* parts/volume info */ static char *ds_device; static int ds_volpart; /* number of parts read in current volume, */ /* including skipped parts */ static int ds_bufsize; -static int ds_skippart; /* number of parts skipped in current volume */ +static int ds_skippart; /* number of parts skipped in current volume */ static int ds_getnextvol(char *device); static int ds_skip(char *device, int nskip); @@ -299,7 +299,7 @@ ds_init(char *device, char **pkg, char *norewind) char line[LSIZE+1]; int i, n, count = 0, header_size = BLK_SIZE; - if (!ds_header) { /* If the header hasn't been read yet */ + if (!ds_header) { /* If the header hasn't been read yet */ if (ds_fd >= 0) (void) ds_close(0); @@ -608,7 +608,7 @@ ds_getnextvol(char *device) (void) sprintf(prompt, pkg_gt("Insert %%v %d of %d into %%p"), ds_volno, ds_volcnt); - if (n = getvol(device, NULL, NULL, prompt)) + if (n = getvol(device, NULL, 0, prompt)) return (n); if ((ds_fd = open(device, O_RDONLY)) < 0) return (-1); diff --git a/usr/src/lib/libpkg/common/mappath.c b/usr/src/lib/libpkg/common/mappath.c index b0ae99d827..f885f81ebf 100644 --- a/usr/src/lib/libpkg/common/mappath.c +++ b/usr/src/lib/libpkg/common/mappath.c @@ -93,7 +93,7 @@ mappath(int flag, char *path) * error. */ if ((token = getenv(varname)) != NULL && - *token != NULL) { + *token != '\0') { /* copy in parameter value */ while (*token) *copy++ = *token++; diff --git a/usr/src/lib/libpkg/common/pkgtrans.c b/usr/src/lib/libpkg/common/pkgtrans.c index cfc4009b08..e3f6276bf3 100644 --- a/usr/src/lib/libpkg/common/pkgtrans.c +++ b/usr/src/lib/libpkg/common/pkgtrans.c @@ -59,7 +59,7 @@ #include "pkglibmsgs.h" #include "pkglocale.h" -extern char *pkgdir; /* pkgparam.c */ +extern char *pkgdir; /* pkgparam.c */ /* libadm.a */ extern char *devattr(char *device, char *attribute); @@ -95,7 +95,7 @@ static char *tmpdir; static char *tmppath; static char *tmpsymdir = NULL; static char dstinst[NON_ABI_NAMELNGTH]; -static char *ids_name, *ods_name; +static char *ids_name, *ods_name; static int ds_volcnt; static int ds_volno; static int compressedsize, has_comp_size; @@ -133,7 +133,7 @@ static char *reloc_names[] = { static int signal_received = 0; -char **xpkg; /* array of transferred packages */ +char **xpkg; /* array of transferred packages */ int nxpkg; static char *allpkg[] = { @@ -253,7 +253,7 @@ _pkgtrans(char *device1, char *device2, char **pkg, int options) /* check for datastream */ ids_name = NULL; if (srcdev.bdevice) { - if (n = _getvol(srcdev.bdevice, NULL, NULL, + if (n = _getvol(srcdev.bdevice, NULL, 0, pkg_gt("Insert %v into %p."), srcdev.norewind)) { cleanup(); if (n == 3) @@ -354,7 +354,7 @@ _pkgtrans(char *device1, char *device2, char **pkg, int options) if (ids_name) { if (srcdev.cdevice && !srcdev.bdevice && - (n = _getvol(srcdev.cdevice, NULL, NULL, NULL, + (n = _getvol(srcdev.cdevice, NULL, 0, NULL, srcdev.norewind))) { cleanup(); if (n == 3) @@ -709,7 +709,7 @@ genheader(char *src, char **pkg) /* add pkg name, number of parts and the max part size */ if (snprintf(tmp_entry, ENTRY_MAX, "%s %d %d", - pkg[i], nparts, maxpsize) >= ENTRY_MAX) { + pkg[i], nparts, maxpsize) >= ENTRY_MAX) { progerr(pkg_gt(ERR_TRANSFER)); logerr(pkg_gt(ERR_MEM)); (void) fclose(fp); @@ -811,7 +811,7 @@ wdsheader(struct dm_buf *hdr, char *device, char **pkg) * of each 512 bytes. */ for (block_cnt = 0; block_cnt < hdr->allocation; - block_cnt += BLK_SIZE) { + block_cnt += BLK_SIZE) { (void) write(ds_fd, (hdr->text_buffer + block_cnt), BLK_SIZE); } @@ -897,11 +897,8 @@ pkgxfer(char *srcinst, int options) struct pkginfo info; FILE *fp, *pp; char *pt, *src, *dst; - char dstdir[PATH_MAX], - temp[PATH_MAX], - srcdir[PATH_MAX], - cmd[CMDSIZE], - pkgname[NON_ABI_NAMELNGTH]; + char dstdir[PATH_MAX], temp[PATH_MAX], srcdir[PATH_MAX]; + char cmd[CMDSIZE], pkgname[NON_ABI_NAMELNGTH]; int i, n, part, nparts, maxpartsize, curpartcnt, iscomp; char volnos[128], tmpvol[128]; struct statvfs64 svfsb; diff --git a/usr/src/lib/libpkg/common/runcmd.c b/usr/src/lib/libpkg/common/runcmd.c index 3be8d36ee2..758753498b 100644 --- a/usr/src/lib/libpkg/common/runcmd.c +++ b/usr/src/lib/libpkg/common/runcmd.c @@ -88,7 +88,7 @@ ecleanup(void) { if (errfile[0]) { (void) unlink(errfile); - errfile[0] = NULL; + errfile[0] = '\0'; } } @@ -218,15 +218,15 @@ epopen(char *cmd, char *mode) if (strlcpy(errfile, perrfile, sizeof (errfile)) > sizeof (errfile)) { progerr(pkg_gt("file name max length %d; name is too long: %s"), - sizeof (errfile), perrfile); - return ((FILE *)0); + sizeof (errfile), perrfile); + return (NULL); } len = strlen(cmd)+6+strlen(errfile); buffer = (char *)calloc(len, sizeof (char)); if (buffer == NULL) { progerr(pkg_gt("no memory in epopen(), errno=%d"), errno); - return ((FILE *)0); + return (NULL); } if (strchr(cmd, '|')) { @@ -237,8 +237,8 @@ epopen(char *cmd, char *mode) if (alen > len) { progerr(pkg_gt("command max length %d; cmd is too long: %s"), - len, cmd); - return ((FILE *)0); + len, cmd); + return (NULL); } pp = popen(buffer, mode); @@ -289,7 +289,7 @@ epclose(FILE *pp) * r_status and r_results have no meaning; * r_status will be -1 * r_results will be NULL - * NOTE: Any results returned is placed in new storage for the + * NOTE: Any results returned is placed in new storage for the * calling method. The caller must use 'free' to dispose * of the storage once the results are no longer needed. * NOTE: If 0 is returned, 'r_status' must be queried to @@ -301,7 +301,7 @@ epclose(FILE *pp) int e_ExecCmdArray(int *r_status, char **r_results, - char *a_inputFile, char *a_cmd, char **a_args) + char *a_inputFile, char *a_cmd, char **a_args) { char *buffer; int bufferIndex; @@ -427,7 +427,7 @@ e_ExecCmdArray(int *r_status, char **r_results, /* read as much child data as there is available buffer space */ bytesRead = read(ipipe[0], buffer + bufferIndex, - bufferSize - bufferIndex); + bufferSize - bufferIndex); /* break out of read loop if end-of-file encountered */ @@ -459,9 +459,9 @@ e_ExecCmdArray(int *r_status, char **r_results, bufferIndex += bytesRead; if (bufferIndex >= bufferSize) { buffer = realloc(buffer, - bufferSize += PIPE_BUFFER_INCREMENT); + bufferSize += PIPE_BUFFER_INCREMENT); (void) memset(buffer + bufferIndex, 0, - bufferSize - bufferIndex); + bufferSize - bufferIndex); } } @@ -538,7 +538,7 @@ e_ExecCmdArray(int *r_status, char **r_results, * Look at r_status for results of Unix command * != 0 - problems executing command * r_status and r_results have no meaning - * NOTE: Any results returned is placed in new storage for the + * NOTE: Any results returned is placed in new storage for the * calling method. The caller must use 'free' to dispose * of the storage once the results are no longer needed. * NOTE: If LU_SUCCESS is returned, 'r_status' must be queried to @@ -547,7 +547,7 @@ e_ExecCmdArray(int *r_status, char **r_results, int e_ExecCmdList(int *r_status, char **r_results, - char *a_inputFile, char *a_cmd, ...) + char *a_inputFile, char *a_cmd, ...) { va_list ap; /* references variable argument list */ char *array[MAX_EXEC_CMD_ARGS+1]; @@ -569,6 +569,5 @@ e_ExecCmdList(int *r_status, char **r_results, } va_end(ap); - return (e_ExecCmdArray(r_status, r_results, a_inputFile, - a_cmd, array)); + return (e_ExecCmdArray(r_status, r_results, a_inputFile, a_cmd, array)); } diff --git a/usr/src/lib/libpkg/common/verify.c b/usr/src/lib/libpkg/common/verify.c index 3329d9aff2..0217636e70 100644 --- a/usr/src/lib/libpkg/common/verify.c +++ b/usr/src/lib/libpkg/common/verify.c @@ -142,9 +142,9 @@ reperr(char *fmt, ...) int cverify(int fix, char *ftype, char *path, struct cinfo *cinfo, - int allow_checksum) + int allow_checksum) { - struct stat status; /* file status buffer */ + struct stat status; /* file status buffer */ struct utimbuf times; unsigned long mycksum; int setval, retcode; @@ -179,11 +179,11 @@ cverify(int fix, char *ftype, char *path, struct cinfo *cinfo, } else if (fix < 0) { /* modtimes must be the same */ if (strftime(tbuf1, sizeof (tbuf1), DATEFMT, - localtime(&cinfo->modtime)) == 0) { + localtime(&cinfo->modtime)) == 0) { reperr(pkg_gt(ERR_MEM)); } if (strftime(tbuf2, sizeof (tbuf2), DATEFMT, - localtime(&status.st_mtime)) == 0) { + localtime(&status.st_mtime)) == 0) { reperr(pkg_gt(ERR_MEM)); } reperr(pkg_gt(ERR_MTIME), tbuf1, tbuf2); @@ -295,7 +295,7 @@ compute_checksum(int *r_cksumerr, char *a_path) */ errno = 0; while ((nread = read(fd, (void*)buf, - (sbuf.st_size < CHUNK) ? sbuf.st_size : CHUNK)) > 0) { + (sbuf.st_size < CHUNK) ? sbuf.st_size : CHUNK)) > 0) { uchar_t *s; uint32_t *p = buf; @@ -328,8 +328,8 @@ compute_checksum(int *r_cksumerr, char *a_path) return (lsavhi+lsavlo); } -static struct stat status; /* file status buffer */ -static struct statvfs vfsstatus; /* filesystem status buffer */ +static struct stat status; /* file status buffer */ +static struct statvfs vfsstatus; /* filesystem status buffer */ /* * Remove the thing that's currently in place so we can put down the package @@ -384,7 +384,7 @@ clear_target(char *path, char *ftype, int is_a_dir) int averify(int fix, char *ftype, char *path, struct ainfo *ainfo) { - struct group *grp; /* group entry buffer */ + struct group *grp; /* group entry buffer */ struct passwd *pwd; int n; int setval; @@ -397,9 +397,9 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) char buf[PATH_MAX]; ino_t my_ino; dev_t my_dev; - char cwd[MAXPATHLEN]; - char *cd; - char *c; + char cwd[MAXPATHLEN]; + char *cd; + char *c; setval = (*ftype == '?'); retcode = 0; @@ -435,7 +435,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) if (strcmp(cd, c) == 0) (void) strcpy(cd, "/"); else - *c = NULL; + *c = '\0'; if (chdir(cd) != 0) { reperr(pkg_gt(ERR_CHDIR), cd); @@ -493,7 +493,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) /* If we are to process symlinks the old way then we follow the link */ if (nonABI_symlinks()) { if ((*ftype == 's') ? lstat(path, &status) : - stat(path, &status)) { + stat(path, &status)) { reperr(pkg_gt(ERR_EXIST)); retcode = VE_EXIST; myftype = '?'; @@ -511,37 +511,37 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) if (!statError) { /* determining actual type of existing object */ switch (status.st_mode & S_IFMT) { - case S_IFLNK: + case S_IFLNK: myftype = 's'; break; - case S_IFIFO: + case S_IFIFO: myftype = 'p'; break; - case S_IFCHR: + case S_IFCHR: myftype = 'c'; break; - case S_IFDIR: + case S_IFDIR: myftype = 'd'; targ_is_dir = 1; break; - case S_IFBLK: + case S_IFBLK: myftype = 'b'; break; - case S_IFREG: - case 0: + case S_IFREG: + case 0: myftype = 'f'; break; - case S_IFDOOR: + case S_IFDOOR: myftype = 'D'; break; - default: + default: reperr(pkg_gt(ERR_UNKNOWN)); return (VE_FTYPE); } @@ -695,7 +695,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) return (VE_FAIL); } } else if (*ftype == 'p') { - if (mknod(path, ainfo->mode | S_IFIFO, NULL) || + if (mknod(path, ainfo->mode | S_IFIFO, 0) || (stat(path, &status) < 0)) { reperr(pkg_gt(ERR_PIPEFAIL)); return (VE_FAIL); @@ -736,7 +736,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) retcode = VE_FAIL; } else { reperr(pkg_gt(ERR_PERM), ainfo->mode, - status.st_mode & 07777); + status.st_mode & 07777); if (!retcode) retcode = VE_ATTR; } diff --git a/usr/src/lib/libscf/common/highlevel.c b/usr/src/lib/libscf/common/highlevel.c index 7defe4ef51..98caa9e518 100644 --- a/usr/src/lib/libscf/common/highlevel.c +++ b/usr/src/lib/libscf/common/highlevel.c @@ -412,7 +412,7 @@ scf_default_secflags(scf_handle_t *hndl, scf_secflags_t *flags) uu_die("Allocation failure\n"); if (scf_handle_decode_fmri(hndl, pfmri, - NULL, NULL, NULL, NULL, prop, NULL) != 0) + NULL, NULL, NULL, NULL, prop, 0) != 0) goto next; if (scf_property_get_value(prop, val) != 0) diff --git a/usr/src/lib/libscf/common/midlevel.c b/usr/src/lib/libscf/common/midlevel.c index 69d5bd09d3..3c75364548 100644 --- a/usr/src/lib/libscf/common/midlevel.c +++ b/usr/src/lib/libscf/common/midlevel.c @@ -136,12 +136,12 @@ static scf_simple_prop_t * fill_prop(scf_property_t *prop, const char *pgname, const char *propname, scf_handle_t *h) { - scf_simple_prop_t *ret; - scf_iter_t *iter; - scf_value_t *val; - int iterret, i; - ssize_t valsize, numvals; - union scf_simple_prop_val *vallist = NULL, *vallist_backup = NULL; + scf_simple_prop_t *ret; + scf_iter_t *iter; + scf_value_t *val; + int iterret, i; + ssize_t valsize, numvals; + union scf_simple_prop_val *vallist = NULL, *vallist_backup = NULL; if ((ret = malloc(sizeof (*ret))) == NULL) { (void) scf_set_error(SCF_ERROR_NO_MEMORY); @@ -478,9 +478,9 @@ transaction_property_set(scf_transaction_t *tx, scf_transaction_entry_t *e, static int get_inst_enabled(const scf_instance_t *inst, const char *pgname) { - scf_propertygroup_t *gpg = NULL; - scf_property_t *eprop = NULL; - scf_value_t *v = NULL; + scf_propertygroup_t *gpg = NULL; + scf_property_t *eprop = NULL; + scf_value_t *v = NULL; scf_handle_t *h = NULL; uint8_t enabled; int ret = -1; @@ -517,13 +517,13 @@ static int set_inst_enabled(const scf_instance_t *inst, uint8_t desired, const char *pgname, uint32_t pgflags) { - scf_transaction_t *tx = NULL; + scf_transaction_t *tx = NULL; scf_transaction_entry_t *ent = NULL; - scf_propertygroup_t *gpg = NULL; - scf_property_t *eprop = NULL; - scf_value_t *v = NULL; + scf_propertygroup_t *gpg = NULL; + scf_property_t *eprop = NULL; + scf_value_t *v = NULL; scf_handle_t *h = NULL; - int ret = -1; + int ret = -1; int committed; uint8_t b; @@ -649,9 +649,9 @@ out: static int delete_inst_enabled(const scf_instance_t *inst, const char *pgname) { - scf_transaction_t *tx = NULL; + scf_transaction_t *tx = NULL; scf_transaction_entry_t *ent = NULL; - scf_propertygroup_t *gpg = NULL; + scf_propertygroup_t *gpg = NULL; scf_handle_t *h = NULL; int ret = -1; int committed; @@ -1343,7 +1343,7 @@ scf_general_pg_setup(const char *fmri, const char *pg_name) } if (scf_handle_decode_fmri(ret->h, fmri, NULL, NULL, ret->inst, - NULL, NULL, NULL) == -1) { + NULL, NULL, 0) == -1) { goto out; } @@ -1566,7 +1566,7 @@ int scf_simple_walk_instances(uint_t state_flags, void *private, int (*inst_callback)(scf_handle_t *, scf_instance_t *, void *)) { - scf_scope_t *scope = NULL; + scf_scope_t *scope = NULL; scf_service_t *svc = NULL; scf_instance_t *inst = NULL; scf_iter_t *svc_iter = NULL, *inst_iter = NULL; @@ -1649,13 +1649,13 @@ out: scf_simple_prop_t * scf_simple_prop_get(scf_handle_t *hin, const char *instance, const char *pgname, - const char *propname) + const char *propname) { - char *fmri_buf, *svcfmri = NULL; - ssize_t fmri_sz; - scf_property_t *prop = NULL; - scf_service_t *svc = NULL; - scf_simple_prop_t *ret; + char *fmri_buf, *svcfmri = NULL; + ssize_t fmri_sz; + scf_property_t *prop = NULL; + scf_service_t *svc = NULL; + scf_simple_prop_t *ret; scf_handle_t *h = NULL; boolean_t local_h = B_TRUE; @@ -1785,10 +1785,10 @@ scf_simple_prop_free(scf_simple_prop_t *prop) scf_simple_app_props_t * scf_simple_app_props_get(scf_handle_t *hin, const char *inst_fmri) { - scf_instance_t *inst = NULL; - scf_service_t *svc = NULL; - scf_propertygroup_t *pg = NULL; - scf_property_t *prop = NULL; + scf_instance_t *inst = NULL; + scf_service_t *svc = NULL; + scf_propertygroup_t *pg = NULL; + scf_property_t *prop = NULL; scf_simple_app_props_t *ret = NULL; scf_iter_t *pgiter = NULL, *propiter = NULL; struct scf_simple_pg *thispg = NULL, *nextpg; @@ -1796,7 +1796,7 @@ scf_simple_app_props_get(scf_handle_t *hin, const char *inst_fmri) scf_handle_t *h = NULL; int pgiter_ret, propiter_ret; ssize_t namelen; - char *propname = NULL, *pgname = NULL, *sys_fmri; + char *propname = NULL, *pgname = NULL, *sys_fmri; uint8_t found; boolean_t local_h = B_TRUE; @@ -2136,8 +2136,8 @@ error2: void scf_simple_app_props_free(scf_simple_app_props_t *propblock) { - struct scf_simple_pg *pgthis, *pgnext; - scf_simple_prop_t *propthis, *propnext; + struct scf_simple_pg *pgthis, *pgnext; + scf_simple_prop_t *propthis, *propnext; if ((propblock == NULL) || (propblock->ap_pglist == NULL)) return; @@ -2165,7 +2165,7 @@ const scf_simple_prop_t * scf_simple_app_props_next(const scf_simple_app_props_t *propblock, scf_simple_prop_t *last) { - struct scf_simple_pg *this; + struct scf_simple_pg *this; if (propblock == NULL) { (void) scf_set_error(SCF_ERROR_NOT_SET); @@ -2230,8 +2230,8 @@ const scf_simple_prop_t * scf_simple_app_props_search(const scf_simple_app_props_t *propblock, const char *pgname, const char *propname) { - struct scf_simple_pg *pg; - scf_simple_prop_t *prop; + struct scf_simple_pg *pg; + scf_simple_prop_t *prop; if ((propblock == NULL) || (propname == NULL)) { (void) scf_set_error(SCF_ERROR_NOT_SET); diff --git a/usr/src/lib/libsip/common/sip_add_hdrs.c b/usr/src/lib/libsip/common/sip_add_hdrs.c index 053fc8dd8b..43a8ebae88 100644 --- a/usr/src/lib/libsip/common/sip_add_hdrs.c +++ b/usr/src/lib/libsip/common/sip_add_hdrs.c @@ -92,8 +92,8 @@ sip_int_to_str(int i) static char * sip_add_aquot_to_str(char *str, boolean_t *alloc) { - char *new_str; - char *tmp = str; + char *new_str; + char *tmp = str; int size; while (isspace(*tmp)) @@ -124,8 +124,8 @@ static int sip_add_empty_hdr(sip_msg_t sip_msg, char *hdr_name) { _sip_header_t *new_header; - int header_size; - _sip_msg_t *_sip_msg; + int header_size; + _sip_msg_t *_sip_msg; int csize = sizeof (char); if (sip_msg == NULL || hdr_name == NULL) @@ -164,8 +164,8 @@ sip_add_2strs_to_msg(sip_msg_t sip_msg, char *hdr_name, char *str1, boolean_t qstr1, char *str2, char *plist, char sep) { _sip_header_t *new_header; - int header_size; - _sip_msg_t *_sip_msg; + int header_size; + _sip_msg_t *_sip_msg; int csize = sizeof (char); if (sip_msg == NULL || str1 == NULL || str2 == NULL || @@ -237,8 +237,8 @@ sip_add_str_to_msg(sip_msg_t sip_msg, char *hdr_name, char *str, char *plist, char param_sep) { _sip_header_t *new_header; - int header_size; - _sip_msg_t *_sip_msg; + int header_size; + _sip_msg_t *_sip_msg; int csize = sizeof (char); if (sip_msg == NULL || str == NULL || (str != NULL && str[0] == '\0')) @@ -287,8 +287,8 @@ static int sip_add_int_to_msg(sip_msg_t sip_msg, char *hdr_name, int i, char *plist) { _sip_header_t *new_header; - int header_size; - _sip_msg_t *_sip_msg; + int header_size; + _sip_msg_t *_sip_msg; char *digit_str; int csize = sizeof (char); @@ -349,8 +349,8 @@ sip_add_intstr_to_msg(sip_msg_t sip_msg, char *hdr_name, int i, char *s, char *plist) { _sip_header_t *new_header; - int header_size; - _sip_msg_t *_sip_msg; + int header_size; + _sip_msg_t *_sip_msg; char *digit_str; int csize = sizeof (char); @@ -580,7 +580,7 @@ sip_add_allow(sip_msg_t sip_msg, sip_method_t method) if (method == 0 || method >= MAX_SIP_METHODS) return (EINVAL); ret = sip_add_str_to_msg(sip_msg, SIP_ALLOW, sip_methods[method].name, - NULL, (char)NULL); + NULL, 0); return (ret); } @@ -646,8 +646,7 @@ sip_add_content_enc(sip_msg_t sip_msg, char *code) if (code == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_CONTENT_ENCODE, code, NULL, - (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_CONTENT_ENCODE, code, NULL, 0); return (ret); } @@ -665,8 +664,7 @@ sip_add_content_lang(sip_msg_t sip_msg, char *lang) if (lang == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_CONTENT_LANG, lang, NULL, - (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_CONTENT_LANG, lang, NULL, 0); return (ret); } @@ -675,7 +673,7 @@ sip_add_content_lang(sip_msg_t sip_msg, char *lang) * SIP-date = rfc1123-date * rfc1123-date = wkday "," SP date1 SP time SP "GMT" * date1 = 2DIGIT SP month SP 4DIGIT - * ; day month year (e.g., 02 Jun 1982) + * ; day month year (e.g., 02 Jun 1982) * time = 2DIGIT ":" 2DIGIT ":" 2DIGIT * ; 00:00:00 - 23:59:59 * wkday = "Mon" / "Tue" / "Wed" @@ -691,7 +689,7 @@ sip_add_date(sip_msg_t sip_msg, char *date) if (date == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_DATE, date, NULL, (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_DATE, date, NULL, 0); return (ret); } @@ -745,8 +743,7 @@ sip_add_in_reply_to(sip_msg_t sip_msg, char *reply_id) if (reply_id == NULL) return (EINVAL); - r = sip_add_str_to_msg(sip_msg, SIP_IN_REPLY_TO, reply_id, NULL, - (char)NULL); + r = sip_add_str_to_msg(sip_msg, SIP_IN_REPLY_TO, reply_id, NULL, 0); return (r); } @@ -788,8 +785,7 @@ sip_add_mime_version(sip_msg_t sip_msg, char *version) if (version == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_MIME_VERSION, version, NULL, - (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_MIME_VERSION, version, NULL, 0); return (ret); } @@ -805,7 +801,7 @@ sip_add_org(sip_msg_t sip_msg, char *org) ret = sip_add_empty_hdr(sip_msg, SIP_ORGANIZATION); } else { ret = sip_add_str_to_msg(sip_msg, SIP_ORGANIZATION, org, NULL, - (char)NULL); + 0); } return (ret); } @@ -823,7 +819,7 @@ sip_add_priority(sip_msg_t sip_msg, char *prio) if (prio == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_PRIORITY, prio, NULL, (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_PRIORITY, prio, NULL, 0); return (ret); } @@ -855,8 +851,7 @@ sip_add_privacy(sip_msg_t sip_msg, char *priv_val) if (priv_val == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_PRIVACY, priv_val, NULL, - (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_PRIVACY, priv_val, NULL, 0); return (ret); } @@ -871,7 +866,7 @@ sip_add_require(sip_msg_t sip_msg, char *req) if (req == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_REQUIRE, req, NULL, (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_REQUIRE, req, NULL, 0); return (ret); } @@ -911,7 +906,7 @@ sip_add_server(sip_msg_t sip_msg, char *svr) if (svr == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_SERVER, svr, NULL, (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_SERVER, svr, NULL, 0); return (ret); } @@ -926,8 +921,8 @@ sip_add_subject(sip_msg_t sip_msg, char *subject) if (subject == NULL) { ret = sip_add_empty_hdr(sip_msg, SIP_SUBJECT); } else { - ret = sip_add_str_to_msg(sip_msg, SIP_SUBJECT, subject, NULL, - (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_SUBJECT, subject, + NULL, 0); } return (ret); } @@ -945,7 +940,7 @@ sip_add_supported(sip_msg_t sip_msg, char *support) ret = sip_add_empty_hdr(sip_msg, SIP_SUPPORT); } else { ret = sip_add_str_to_msg(sip_msg, SIP_SUPPORT, support, NULL, - (char)NULL); + 0); } return (ret); } @@ -961,8 +956,7 @@ sip_add_tstamp(sip_msg_t sip_msg, char *time, char *delay) int ret; if (delay == NULL) { - ret = sip_add_str_to_msg(sip_msg, SIP_TIMESTAMP, time, NULL, - (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_TIMESTAMP, time, NULL, 0); } else { ret = sip_add_2strs_to_msg(sip_msg, SIP_TIMESTAMP, time, B_FALSE, delay, NULL, ' '); @@ -980,8 +974,7 @@ sip_add_unsupported(sip_msg_t sip_msg, char *unsupport) if (unsupport == NULL) return (EINVAL); - ret = sip_add_str_to_msg(sip_msg, SIP_UNSUPPORT, unsupport, NULL, - (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_UNSUPPORT, unsupport, NULL, 0); return (ret); } @@ -995,7 +988,7 @@ sip_add_user_agent(sip_msg_t sip_msg, char *usr) if (usr == NULL) return (EINVAL); - r = sip_add_str_to_msg(sip_msg, SIP_USER_AGENT, usr, NULL, (char)NULL); + r = sip_add_str_to_msg(sip_msg, SIP_USER_AGENT, usr, NULL, 0); return (r); } @@ -1013,8 +1006,8 @@ int sip_add_warning(sip_msg_t sip_msg, int code, char *addr, char *msg) { _sip_header_t *new_header; - int header_size; - _sip_msg_t *_sip_msg; + int header_size; + _sip_msg_t *_sip_msg; char *hdr_name = SIP_WARNING; if (sip_msg == NULL || addr == NULL || msg == NULL || @@ -1060,8 +1053,8 @@ int sip_add_rack(sip_msg_t sip_msg, int resp_num, int cseq, sip_method_t method) { _sip_header_t *new_header; - int header_size; - _sip_msg_t *_sip_msg; + int header_size; + _sip_msg_t *_sip_msg; char *hdr_name = SIP_RACK; if (sip_msg == NULL || resp_num <= 0 || cseq < 0 || method <= 0 || @@ -1107,8 +1100,8 @@ sip_add_rack(sip_msg_t sip_msg, int resp_num, int cseq, sip_method_t method) int sip_add_allow_events(sip_msg_t sip_msg, char *t_event) { - return (sip_add_str_to_msg(sip_msg, SIP_ALLOW_EVENTS, t_event, NULL, - (char)NULL)); + return (sip_add_str_to_msg(sip_msg, SIP_ALLOW_EVENTS, t_event, + NULL, 0)); } /* @@ -1130,13 +1123,13 @@ sip_add_event(sip_msg_t sip_msg, char *t_event, char *plist) /* * Subscription-State = "Subscription-State" HCOLON substate-value - * *( SEMI subexp-params ) + * *( SEMI subexp-params ) * substate-value = "active" / "pending" / "terminated" * / extension-substate * extension-substate = token * subexp-params = ("reason" EQUAL event-reason-value) * / ("expires" EQUAL delta-seconds)* - * / ("retry-after" EQUAL delta-seconds) + * / ("retry-after" EQUAL delta-seconds) * / generic-param * event-reason-value = "deactivated" * / "probation" @@ -1176,7 +1169,7 @@ sip_add_substate(sip_msg_t sip_msg, char *sub, char *plist) * dresponse = "response" EQUAL request-digest * request-digest = LDQUOT 32LHEX RDQUOT * auth-param = auth-param-name EQUAL - * ( token / quoted-string ) + * ( token / quoted-string ) * auth-param-name = token * other-response = auth-scheme LWS auth-param * *(COMMA auth-param) @@ -1201,8 +1194,7 @@ sip_add_author(sip_msg_t sip_msg, char *scheme, char *param) int sip_add_authen_info(sip_msg_t sip_msg, char *ainfo) { - return (sip_add_str_to_msg(sip_msg, SIP_AUTHEN_INFO, ainfo, NULL, - (char)NULL)); + return (sip_add_str_to_msg(sip_msg, SIP_AUTHEN_INFO, ainfo, NULL, 0)); } /* @@ -1210,7 +1202,7 @@ sip_add_authen_info(sip_msg_t sip_msg, char *ainfo) * challenge = ("Digest" LWS digest-cln *(COMMA digest-cln)) * / other-challenge * other-challenge = auth-scheme LWS auth-param - * *(COMMA auth-param) + * *(COMMA auth-param) * digest-cln = realm / domain / nonce * / opaque / stale / algorithm * / qop-options / auth-param @@ -1254,8 +1246,7 @@ sip_add_proxy_author(sip_msg_t sip_msg, char *paschem, char *paparam) int sip_add_proxy_require(sip_msg_t sip_msg, char *opt) { - return (sip_add_str_to_msg(sip_msg, SIP_PROXY_REQ, opt, NULL, - (char)NULL)); + return (sip_add_str_to_msg(sip_msg, SIP_PROXY_REQ, opt, NULL, 0)); } /* @@ -1289,8 +1280,7 @@ sip_add_callid(sip_msg_t sip_msg, char *callid) return (ENOMEM); allocd = B_TRUE; } - ret = sip_add_str_to_msg(sip_msg, SIP_CALL_ID, callid, NULL, - (char)NULL); + ret = sip_add_str_to_msg(sip_msg, SIP_CALL_ID, callid, NULL, 0); if (allocd) free(callid); return (ret); @@ -1465,7 +1455,7 @@ int sip_add_content_length(_sip_msg_t *_sip_msg, int length) { _sip_header_t *new_header; - int header_size; + int header_size; if (_sip_msg == NULL || length < 0) return (EINVAL); diff --git a/usr/src/lib/libsip/common/sip_headers.c b/usr/src/lib/libsip/common/sip_headers.c index d299ab4e79..646c899e8a 100644 --- a/usr/src/lib/libsip/common/sip_headers.c +++ b/usr/src/lib/libsip/common/sip_headers.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <assert.h> #include <errno.h> @@ -727,8 +725,8 @@ _sip_get_header_functions(sip_header_function_t *sip_header_function_table, return (NULL); } header_name = sip_header->sip_hdr_current; - if (sip_find_separator(sip_header, SIP_HCOLON, (char)NULL, - (char)NULL, B_FALSE) != 0) { + if (sip_find_separator(sip_header, SIP_HCOLON, 0, + 0, B_FALSE) != 0) { return (NULL); } len = sip_header->sip_hdr_current - header_name; diff --git a/usr/src/lib/libsip/common/sip_parse_generic.c b/usr/src/lib/libsip/common/sip_parse_generic.c index 98f459b1b0..02401bfa6f 100644 --- a/usr/src/lib/libsip/common/sip_parse_generic.c +++ b/usr/src/lib/libsip/common/sip_parse_generic.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdlib.h> #include <assert.h> #include <errno.h> @@ -117,11 +115,11 @@ sip_find_separator(_sip_header_t *sip_header, char separator_1st, continue; } if (isspace(*sip_header->sip_hdr_current) || - (separator_1st != (char)NULL && + (separator_1st != 0 && (*sip_header->sip_hdr_current == separator_1st)) || - (separator_2nd != (char)NULL && + (separator_2nd != 0 && (*sip_header->sip_hdr_current == separator_2nd)) || - (separator_3rd != (char)NULL && + (separator_3rd != 0 && (*sip_header->sip_hdr_current == separator_3rd))) { return (0); } @@ -320,7 +318,7 @@ sip_parse_params(_sip_header_t *sip_header, sip_param_t **parsed_list) if (quoted_name && sip_find_token(sip_header, SIP_QUOTE) != 0) { return (EPROTO); } else if (sip_find_separator(sip_header, SIP_SEMI, SIP_COMMA, - (char)NULL, B_FALSE) != 0) { + 0, B_FALSE) != 0) { return (EPROTO); } param->param_value.sip_str_len = sip_header->sip_hdr_current - @@ -535,7 +533,7 @@ sip_parse_hdr_parser1(_sip_header_t *hdr, sip_parsed_header_t **phdr, char sep) B_FALSE) == 0) { char c = *hdr->sip_hdr_current; - if (isspace(c) && sep == (char)NULL) { + if (isspace(c) && sep == 0) { value->str_val_ptr = value->sip_value_start; value->str_val_len = hdr->sip_hdr_current - value->sip_value_start; @@ -571,7 +569,7 @@ sip_parse_hdr_parser1(_sip_header_t *hdr, sip_parsed_header_t **phdr, char sep) /* * two strings, use sip_2strs_t */ - if ((sep != (char)NULL) && (c == sep)) { + if ((sep != 0) && (c == sep)) { value->strs1_val_ptr = value->sip_value_start; value->strs1_val_len = hdr->sip_hdr_current - value->sip_value_start; @@ -579,7 +577,7 @@ sip_parse_hdr_parser1(_sip_header_t *hdr, sip_parsed_header_t **phdr, char sep) value->strs2_val_ptr = (++hdr->sip_hdr_current); if (sip_find_separator(hdr, SIP_SEMI, SIP_COMMA, - (char)NULL, B_FALSE) == 0) { + 0, B_FALSE) == 0) { char t = *(hdr->sip_hdr_current); value->strs2_val_len = hdr->sip_hdr_current - @@ -598,7 +596,7 @@ sip_parse_hdr_parser1(_sip_header_t *hdr, sip_parsed_header_t **phdr, char sep) hdr->sip_hdr_current; goto end; } - } else if (sep != (char)NULL) { + } else if (sep != 0) { value->sip_value_state = SIP_VALUE_BAD; goto get_next_val; } @@ -827,7 +825,7 @@ sip_parse_hdr_parser3(_sip_header_t *hdr, sip_parsed_header_t **phdr, int type, cur = value->sip_value_start; hdr->sip_hdr_current = cur; if (sip_find_separator(hdr, SIP_COMMA, - (char)NULL, (char)NULL, B_FALSE) != 0) { + 0, 0, B_FALSE) != 0) { value->strs2_val_ptr = cur; value->strs2_val_len = hdr->sip_hdr_current - @@ -885,7 +883,7 @@ sip_parse_hdr_parser3(_sip_header_t *hdr, sip_parsed_header_t **phdr, int type, sip_parse_uri_str(&value->str_val, value); } - r = sip_find_separator(hdr, SIP_COMMA, SIP_SEMI, (char)NULL, + r = sip_find_separator(hdr, SIP_COMMA, SIP_SEMI, 0, B_FALSE); if (r != 0) { value->sip_value_end = hdr->sip_hdr_current; @@ -1043,7 +1041,7 @@ sip_parse_hdr_parser5(_sip_header_t *hdr, sip_parsed_header_t **phdr, tmp_param = new_param; tmp_param->param_name.sip_str_ptr = tmp_cur; - if (sip_find_separator(hdr, SIP_EQUAL, SIP_COMMA, (char)NULL, + if (sip_find_separator(hdr, SIP_EQUAL, SIP_COMMA, 0, B_FALSE) != 0) { tmp_param->param_name.sip_str_len = hdr->sip_hdr_current - tmp_cur; diff --git a/usr/src/lib/libsip/common/sip_parse_hdrs.c b/usr/src/lib/libsip/common/sip_parse_hdrs.c index e7ee91acad..39486323b2 100644 --- a/usr/src/lib/libsip/common/sip_parse_hdrs.c +++ b/usr/src/lib/libsip/common/sip_parse_hdrs.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <ctype.h> #include <errno.h> #include <stdlib.h> @@ -63,9 +61,9 @@ sip_parse_acpt_header(_sip_header_t *sip_header, sip_parsed_header_t **header) */ int sip_parse_acpt_encode_header(_sip_header_t *sip_header, - sip_parsed_header_t **header) + sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -75,11 +73,11 @@ sip_parse_acpt_encode_header(_sip_header_t *sip_header, */ int sip_parse_acpt_lang_header(_sip_header_t *sip_header, - sip_parsed_header_t **header) + sip_parsed_header_t **header) { if (sip_is_empty_hdr(sip_header)) return (sip_parse_hdr_empty(sip_header, header)); - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -132,8 +130,7 @@ sip_parse_allow_header(_sip_header_t *hdr, sip_parsed_header_t **phdr) value->sip_value_start = hdr->sip_hdr_current; value->sip_value_header = parsed_header; - if (sip_find_separator(hdr, SIP_COMMA, (char)NULL, - (char)NULL, B_FALSE) == 0) { + if (sip_find_separator(hdr, SIP_COMMA, 0, 0, B_FALSE) == 0) { multi_value = B_TRUE; } @@ -196,7 +193,7 @@ int sip_parse_contentdis_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -207,7 +204,7 @@ int sip_parse_contentencode_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -221,7 +218,7 @@ int sip_parse_contentlang_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -355,7 +352,7 @@ int sip_parse_inreplyto_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -449,7 +446,7 @@ int sip_parse_privacy_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } @@ -460,7 +457,7 @@ int sip_parse_require_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -570,7 +567,7 @@ sip_parse_support_header(_sip_header_t *sip_header, { if (sip_is_empty_hdr(sip_header)) return (sip_parse_hdr_empty(sip_header, header)); - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -654,7 +651,7 @@ int sip_parse_usupport_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -877,7 +874,7 @@ int sip_parse_allow_events_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -893,18 +890,18 @@ sip_parse_allow_events_header(_sip_header_t *sip_header, int sip_parse_event_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* * Subscription-State = "Subscription-State" HCOLON substate-value - * *( SEMI subexp-params ) + * *( SEMI subexp-params ) * substate-value = "active" / "pending" / "terminated" * / extension-substate * extension-substate = token * subexp-params = ("reason" EQUAL event-reason-value) * / ("expires" EQUAL delta-seconds)* - * / ("retry-after" EQUAL delta-seconds) + * / ("retry-after" EQUAL delta-seconds) * / generic-param * event-reason-value = "deactivated" * / "probation" @@ -919,7 +916,7 @@ int sip_parse_substate_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -944,7 +941,7 @@ sip_parse_substate_header(_sip_header_t *sip_header, * dresponse = "response" EQUAL request-digest * request-digest = LDQUOT 32LHEX RDQUOT * auth-param = auth-param-name EQUAL - * ( token / quoted-string ) + * ( token / quoted-string ) * auth-param-name = token * other-response = auth-scheme LWS auth-param * *(COMMA auth-param) @@ -972,7 +969,7 @@ int sip_parse_ainfo_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -980,7 +977,7 @@ sip_parse_ainfo_header(_sip_header_t *sip_header, * challenge = ("Digest" LWS digest-cln *(COMMA digest-cln)) * / other-challenge * other-challenge = auth-scheme LWS auth-param - * *(COMMA auth-param) + * *(COMMA auth-param) * digest-cln = realm / domain / nonce * / opaque / stale / algorithm * / qop-options / auth-param @@ -1026,7 +1023,7 @@ int sip_parse_preq_header(_sip_header_t *sip_header, sip_parsed_header_t **header) { - return (sip_parse_hdr_parser1(sip_header, header, (char)NULL)); + return (sip_parse_hdr_parser1(sip_header, header, 0)); } /* @@ -1581,8 +1578,7 @@ sip_parse_cftr_header(_sip_header_t *sip_header, sip_parsed_header_t **header) tmp_ptr = sip_header->sip_hdr_current; - if (sip_find_separator(sip_header, SIP_RAQUOT, (char)NULL, - (char)NULL, B_FALSE)) { + if (sip_find_separator(sip_header, SIP_RAQUOT, 0, 0, B_FALSE)) { if (sip_goto_next_value(sip_header) != 0) { sip_free_cftr_header(parsed_header); return (EPROTO); diff --git a/usr/src/lib/libsip/common/sip_uri_ui.c b/usr/src/lib/libsip/common/sip_uri_ui.c index 5a83f106cc..e49e075de7 100644 --- a/usr/src/lib/libsip/common/sip_uri_ui.c +++ b/usr/src/lib/libsip/common/sip_uri_ui.c @@ -23,8 +23,6 @@ * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdlib.h> #include <string.h> #include <ctype.h> @@ -236,7 +234,7 @@ sip_get_uri_port(const struct sip_uri *uri, int *error) _uri = sip_check_get_param(uri, error); if (_uri == NULL) - return (NULL); + return (0); if ((_uri->sip_uri_errflags & SIP_URIERR_PORT) != 0) { if (error != NULL) diff --git a/usr/src/lib/libsip/common/sip_xaction_ui.c b/usr/src/lib/libsip/common/sip_xaction_ui.c index bc60dfb07d..b59c3bca44 100644 --- a/usr/src/lib/libsip/common/sip_xaction_ui.c +++ b/usr/src/lib/libsip/common/sip_xaction_ui.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdlib.h> #include <assert.h> #include <errno.h> @@ -203,7 +201,7 @@ sip_get_trans_state(sip_transaction_t trans, int *error) if (xaction == NULL) { if (error != NULL) *error = EINVAL; - return (NULL); + return (0); } return (xaction->sip_xaction_state); } diff --git a/usr/src/lib/libtsol/common/getpathbylabel.c b/usr/src/lib/libtsol/common/getpathbylabel.c index 069ce0a6c6..22a0da1329 100644 --- a/usr/src/lib/libtsol/common/getpathbylabel.c +++ b/usr/src/lib/libtsol/common/getpathbylabel.c @@ -23,9 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - - /* * Name: getpathbylabel.c * @@ -182,7 +179,7 @@ tsol_mkmntlist(void) return (NULL); } resetmnttab(mounted); - while (getmntent(mounted, &mnt) == NULL) { + while (getmntent(mounted, &mnt) == 0) { mntl = (struct mntlist *)malloc(sizeof (*mntl)); if (mntl == NULL) { tsol_mlist_free(mntst); diff --git a/usr/src/lib/libtsol/common/setflabel.c b/usr/src/lib/libtsol/common/setflabel.c index 1d645c8d23..f22905541a 100644 --- a/usr/src/lib/libtsol/common/setflabel.c +++ b/usr/src/lib/libtsol/common/setflabel.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Change the label of a file */ @@ -204,7 +202,7 @@ zonecopy(m_label_t *src_win_sl, char *remote_dir, char *filename, if (datasize > bufsize) { if ((callp = (labeld_data_t *)malloc(datasize)) == NULL) { - return (NULL); + return (0); } bufsize = datasize; } diff --git a/usr/src/lib/libumem/amd64/umem_genasm.c b/usr/src/lib/libumem/amd64/umem_genasm.c index 6f0c72ab34..c5bc6048eb 100644 --- a/usr/src/lib/libumem/amd64/umem_genasm.c +++ b/usr/src/lib/libumem/amd64/umem_genasm.c @@ -75,6 +75,7 @@ #include <errno.h> + const int umem_genasm_supported = 1; static uintptr_t umem_genasm_mptr = (uintptr_t)&_malloc; static size_t umem_genasm_msize = 576; diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c b/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c index b5c86496dd..100f0f7cba 100644 --- a/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c +++ b/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c @@ -55,15 +55,15 @@ static int num_stop_rv = sizeof (stop_rv) / sizeof (CK_RV); * it doesn't need to be used by the code at this point. * * static CK_RV try_again_rv[] = { - * CKR_DEVICE_ERROR, - * CKR_DEVICE_MEMORY, - * CKR_DEVICE_REMOVED, - * CKR_FUNCTION_FAILED, - * CKR_GENERAL_ERROR, - * CKR_HOST_MEMORY, - * CKR_TEMPLATE_INCONSISTENT, - * CKR_ATTRIBUTE_READ_ONLY, - * CKR_ATTRIBUTE_VALUE_INVALID + * CKR_DEVICE_ERROR, + * CKR_DEVICE_MEMORY, + * CKR_DEVICE_REMOVED, + * CKR_FUNCTION_FAILED, + * CKR_GENERAL_ERROR, + * CKR_HOST_MEMORY, + * CKR_TEMPLATE_INCONSISTENT, + * CKR_ATTRIBUTE_READ_ONLY, + * CKR_ATTRIBUTE_VALUE_INVALID * }; * static int num_try_again_rv = sizeof (try_again_rv) / sizeof (CK_RV); */ @@ -180,7 +180,7 @@ meta_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, */ if (meta_freeobject_check(session, object, NULL, pTemplate, ulCount, - NULL)) { + 0)) { /* * Make sure we are logged into the keystore if this is a * private freetoken object. diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaObjectManager.c b/usr/src/lib/pkcs11/libpkcs11/common/metaObjectManager.c index 45dfb8c45f..841615975b 100644 --- a/usr/src/lib/pkcs11/libpkcs11/common/metaObjectManager.c +++ b/usr/src/lib/pkcs11/libpkcs11/common/metaObjectManager.c @@ -1243,7 +1243,7 @@ clone_by_wrap(meta_object_t *object, slot_object_t *new_clone, slot_session_t *dst_slot_session) { slot_session_t *src_slot_session = NULL; - CK_OBJECT_HANDLE wrappingKey = NULL, unwrappingKey = NULL; + CK_OBJECT_HANDLE wrappingKey = 0, unwrappingKey = 0; CK_MECHANISM wrappingMech; CK_BYTE *wrappedKey = NULL; CK_ULONG wrappedKeyLen = 0; diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaUtil.c b/usr/src/lib/pkcs11/libpkcs11/common/metaUtil.c index 09e21c30a0..f59f51faba 100644 --- a/usr/src/lib/pkcs11/libpkcs11/common/metaUtil.c +++ b/usr/src/lib/pkcs11/libpkcs11/common/metaUtil.c @@ -35,7 +35,7 @@ static boolean_t threshold_chk_enabled = B_FALSE; CK_RV meta_operation_init_defer(CK_FLAGS optype, meta_session_t *session, - CK_MECHANISM *pMechanism, meta_object_t *key) + CK_MECHANISM *pMechanism, meta_object_t *key) { if (session->init.pMech == NULL) { @@ -108,7 +108,7 @@ meta_operation_init_defer(CK_FLAGS optype, meta_session_t *session, */ CK_RV meta_operation_init(CK_FLAGS optype, meta_session_t *session, - CK_MECHANISM *pMechanism, meta_object_t *key) + CK_MECHANISM *pMechanism, meta_object_t *key) { CK_RV rv, save_rv; mechinfo_t **supporting_slots; @@ -325,7 +325,7 @@ finish: */ CK_RV meta_operation_init_softtoken(CK_FLAGS optype, meta_session_t *session, - CK_MECHANISM *pMechanism, meta_object_t *key) + CK_MECHANISM *pMechanism, meta_object_t *key) { CK_RV rv = CKR_FUNCTION_FAILED; slot_session_t *init_session = NULL; @@ -917,8 +917,8 @@ get_slotlist_for_mech(CK_MECHANISM_TYPE mech_type, */ CK_RV meta_generate_keys(meta_session_t *session, CK_MECHANISM *pMechanism, - CK_ATTRIBUTE *k1Template, CK_ULONG k1AttrCount, meta_object_t *key1, - CK_ATTRIBUTE *k2Template, CK_ULONG k2AttrCount, meta_object_t *key2) + CK_ATTRIBUTE *k1Template, CK_ULONG k1AttrCount, meta_object_t *key1, + CK_ATTRIBUTE *k2Template, CK_ULONG k2AttrCount, meta_object_t *key2) { CK_RV rv, save_rv; slot_session_t *gen_session = NULL; @@ -977,7 +977,7 @@ meta_generate_keys(meta_session_t *session, CK_MECHANISM *pMechanism, } if (meta_freeobject_check(session, key1, pMechanism, k1Template, - k1AttrCount, NULL)) { + k1AttrCount, 0)) { if ((key1->isPrivate || (doKeyPair && key2->isPrivate)) && !metaslot_logged_in()) @@ -1298,10 +1298,10 @@ finish: */ CK_RV meta_unwrap_key(meta_session_t *session, - CK_MECHANISM *pMechanism, meta_object_t *unwrapping_key, - CK_BYTE *wrapped_key, CK_ULONG wrapped_key_len, - CK_ATTRIBUTE *template, CK_ULONG template_size, - meta_object_t *unwrapped_key) + CK_MECHANISM *pMechanism, meta_object_t *unwrapping_key, + CK_BYTE *wrapped_key, CK_ULONG wrapped_key_len, + CK_ATTRIBUTE *template, CK_ULONG template_size, + meta_object_t *unwrapped_key) { CK_RV rv, save_rv; CK_OBJECT_HANDLE hUnwrappedKey; @@ -1452,11 +1452,11 @@ finish: */ CK_RV meta_derive_key(meta_session_t *session, CK_MECHANISM *pMechanism, - meta_object_t *basekey1, meta_object_t *basekey2, - CK_OBJECT_HANDLE *phBaseKey2, - CK_ATTRIBUTE *pTemplate, CK_ULONG ulAttributeCount, - meta_object_t *newKey1, meta_object_t *newKey2, - meta_object_t *newKey3, meta_object_t *newKey4) + meta_object_t *basekey1, meta_object_t *basekey2, + CK_OBJECT_HANDLE *phBaseKey2, + CK_ATTRIBUTE *pTemplate, CK_ULONG ulAttributeCount, + meta_object_t *newKey1, meta_object_t *newKey2, + meta_object_t *newKey3, meta_object_t *newKey4) { CK_RV rv, save_rv; CK_OBJECT_HANDLE hDerivedKey; @@ -1495,7 +1495,7 @@ meta_derive_key(meta_session_t *session, CK_MECHANISM *pMechanism, } if (meta_freeobject_check(session, newKey1, pMechanism, pTemplate, - ulAttributeCount, NULL)) { + ulAttributeCount, 0)) { if (newKey1->isPrivate && !metaslot_logged_in()) return (CKR_USER_NOT_LOGGED_IN); diff --git a/usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c b/usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c index 68f997e103..882ca9f8bd 100644 --- a/usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c +++ b/usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c @@ -289,7 +289,7 @@ SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession, CK_MECHANISM_TYPE mech, /* template for creating generic secret key object */ CK_ATTRIBUTE template[NUM_SECRETKEY_ATTRS]; - if ((hSession == NULL) || (obj == NULL) || + if ((hSession == CK_INVALID_HANDLE) || (obj == NULL) || (rawkey == NULL) || (rawkey_len == 0)) { return (CKR_ARGUMENTS_BAD); } @@ -386,7 +386,7 @@ pkcs11_PasswdToPBKD2Object(CK_SESSION_HANDLE hSession, char *passphrase, CK_ULONG i, j, num_asym_mechs, num_fixed_secs, num_mapping; CK_ATTRIBUTE template[NUM_SECRETKEY_ATTRS]; - if (hSession == NULL || obj == NULL || + if (hSession == CK_INVALID_HANDLE || obj == NULL || passphrase == NULL || passphrase_len == 0 || iterations == 0UL) { return (CKR_ARGUMENTS_BAD); @@ -510,9 +510,9 @@ pkcs11_ObjectToKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE obj, CK_RV rv; CK_ATTRIBUTE template; - if (hSession == NULL) + if (hSession == CK_INVALID_HANDLE) return (CKR_SESSION_HANDLE_INVALID); - if (obj == NULL) + if (obj == 0) return (CKR_OBJECT_HANDLE_INVALID); if (rawkey == NULL || rawkey_len == NULL) return (CKR_ARGUMENTS_BAD); |