summaryrefslogtreecommitdiff
path: root/usr/src/cmd/addbadsec/ix_altsctr.c
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-02-05 12:55:26 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-02-05 12:55:26 +0000
commitfc7d1728f1b98070dfbbebfbb53b62279b33cfe2 (patch)
treeb241cde02240844b32b3c2b84b1b5bdd5f117448 /usr/src/cmd/addbadsec/ix_altsctr.c
parentb156585baf970b2e42dc1e9dc920784b85983ab1 (diff)
parenta6f5e66afa6ed3ba58a8adebd9096d051e369784 (diff)
downloadillumos-joyent-fc7d1728f1b98070dfbbebfbb53b62279b33cfe2.tar.gz
[illumos-gate merge]
commit a6f5e66afa6ed3ba58a8adebd9096d051e369784 10341 uts: boot_fb_eraseline_impl() may use uninitialized variable commit a27563ebf538498a498f296db05c6cde1cd3e782 10332 uts: tem_safe_pix_clear_entire_screen() should use window offset commit 6eda379352cafb14ed1d54166fe88b67fbefac4d 10315 acpi: NULL pointer errors commit f642269fe771b10890afea92038f4531cd50cfd9 10313 iconv_modules: NULL pointer errors commit 8d44205c2de6047b3104694e998664b7a1c527ab 10311 addbadsec: NULL pointer errors commit de4cec4850ed6a4d4ee96e179e79e02a3d872ea3 10310 auditconfig: NULL pointer errors commit 332e84f52cdee3d0232bd5ac5306c42177959c96 10309 mkstr: NULL pointer errors commit 632cbd96e544a0a21f1a1f7ca071b145f379215d 10308 tset: NULL pointer errors commit edd4c52697927997fb1ce3c2c4c425e5ca3a56d6 10307 chown: NULL pointer errors commit 5243e3342f14ea9f300eadae1c8524571a933a1b 10305 print: NULL pointer errors commit 4f6502b6d39d77ac4bfb06b65b8ef1bb89b010ba 10304 sysclass: cast between incompatible function types commit 2325c4ff7eacda26747f8eb679e86fdaf23a7ff8 10303 audioconvert: ISO C++ forbids declaration of 'main' with no type commit 941b7e9c849240e1a04a25b32722d30dae557dc3 10302 sed: this statement may fall through commit b6e3994c8d3dda9030c4b653901b7d478245d3cb 10301 pcifm: cast between incompatible function types
Diffstat (limited to 'usr/src/cmd/addbadsec/ix_altsctr.c')
-rw-r--r--usr/src/cmd/addbadsec/ix_altsctr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/cmd/addbadsec/ix_altsctr.c b/usr/src/cmd/addbadsec/ix_altsctr.c
index 9907689d94..45471c8bb0 100644
--- a/usr/src/cmd/addbadsec/ix_altsctr.c
+++ b/usr/src/cmd/addbadsec/ix_altsctr.c
@@ -274,7 +274,7 @@ init_altsctr(void)
ap->ap_tblp->alts_map_base =
altsmap_alloc(ap->ap_tbl_secsiz / NBPSCTR,
ap->part.p_size, ap->ap_map_sectot, ALTS_MAP_UP);
- if (ap->ap_tblp->alts_map_base == NULL) {
+ if (ap->ap_tblp->alts_map_base == 0) {
perror("Unable to allocate alternate map on disk: ");
exit(57);
}
@@ -482,7 +482,7 @@ gen_alts_ent(void)
altsmap_alloc(ap->ap_tblp->alts_map_base + ap->ap_map_sectot,
ap->part.p_size,
ap->ap_ent_secsiz / NBPSCTR, ALTS_MAP_UP);
- if (ap->ap_tblp->alts_ent_base == NULL) {
+ if (ap->ap_tblp->alts_ent_base == 0) {
perror("Unable to allocate alternate entry table on disk: ");
exit(65);
}
@@ -512,7 +512,7 @@ assign_altsctr(void)
alts_ind =
altsmap_alloc(ap->part.p_size-1, ap->ap_tblp->alts_map_base +
ap->ap_map_sectot - 1, cluster, ALTS_MAP_DOWN);
- if (alts_ind == NULL) {
+ if (alts_ind == 0) {
(void) fprintf(stderr,
"Unable to allocate alternates for bad starting"
" sector %u.\n", (ap->ap_entp)[i].bad_start);