diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c --- a/sys/geom/bde/g_bde.c +++ b/sys/geom/bde/g_bde.c @@ -208,8 +208,7 @@ g_access(cp, -1, -1, -1); g_detach(cp); g_destroy_consumer(cp); - if (gp->softc != NULL) - g_free(gp->softc); + g_free(gp->softc); g_destroy_geom(gp); switch (error) { case ENOENT: diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c --- a/sys/geom/eli/g_eli.c +++ b/sys/geom/eli/g_eli.c @@ -798,8 +798,7 @@ goto end; /* Metadata was read and decoded successfully. */ end: - if (buf != NULL) - g_free(buf); + g_free(buf); if (cp->provider != NULL) { if (cp->acr == 1) g_access(cp, -1, 0, 0); diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -226,8 +226,7 @@ g_free(sc->sc_cinfo); if (sc->sc_itable != NULL) { for (ii = sc->sc_itable; ii->ii_ndisk > 0; ii++) - if (ii->ii_index != NULL) - g_free(ii->ii_index); + g_free(ii->ii_index); g_free(sc->sc_itable); } g_free(sc); diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -701,8 +701,7 @@ error = copyout(new_entries, old_entries, alloc_size); if (old_entries != NULL && rep != NULL) rep->entries = old_entries; - if (new_entries != NULL) - g_free(new_entries); + g_free(new_entries); break; } default: diff --git a/sys/geom/geom_redboot.c b/sys/geom/geom_redboot.c --- a/sys/geom/geom_redboot.c +++ b/sys/geom/geom_redboot.c @@ -298,15 +298,13 @@ if (buf != NULL) head = parse_fis_directory(buf, blksize, offset, offmask); if (head == NULL && offset != 0) { - if (buf != NULL) - g_free(buf); + g_free(buf); offset = 0; /* check the front */ goto again; } g_topology_lock(); if (head == NULL) { - if (buf != NULL) - g_free(buf); + g_free(buf); return NULL; } /* diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c --- a/sys/geom/geom_slice.c +++ b/sys/geom/geom_slice.c @@ -88,10 +88,8 @@ if (gsp == NULL) return; g_free(gsp->slices); - if (gsp->hotspot != NULL) - g_free(gsp->hotspot); - if (gsp->softc != NULL) - g_free(gsp->softc); + g_free(gsp->hotspot); + g_free(gsp->softc); g_free(gsp); } diff --git a/sys/geom/label/g_label_msdosfs.c b/sys/geom/label/g_label_msdosfs.c --- a/sys/geom/label/g_label_msdosfs.c +++ b/sys/geom/label/g_label_msdosfs.c @@ -215,10 +215,8 @@ g_label_rtrim(label, size); error: - if (sector0 != NULL) - g_free(sector0); - if (sector != NULL) - g_free(sector); + g_free(sector0); + g_free(sector); } struct g_label_desc g_label_msdosfs = { diff --git a/sys/geom/label/g_label_ntfs.c b/sys/geom/label/g_label_ntfs.c --- a/sys/geom/label/g_label_ntfs.c +++ b/sys/geom/label/g_label_ntfs.c @@ -175,10 +175,8 @@ } } done: - if (bf != NULL) - g_free(bf); - if (filerecp != NULL) - g_free(filerecp); + g_free(bf); + g_free(filerecp); } struct g_label_desc g_label_ntfs = { diff --git a/sys/geom/part/g_part_bsd.c b/sys/geom/part/g_part_bsd.c --- a/sys/geom/part/g_part_bsd.c +++ b/sys/geom/part/g_part_bsd.c @@ -249,8 +249,7 @@ struct g_part_bsd_table *table; table = (struct g_part_bsd_table *)basetable; - if (table->bbarea != NULL) - g_free(table->bbarea); + g_free(table->bbarea); table->bbarea = NULL; /* Wipe the second sector to clear the partitioning. */ diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -534,8 +534,7 @@ return (hdr); fail: - if (hdr != NULL) - g_free(hdr); + g_free(hdr); g_free(buf); return (NULL); } @@ -989,14 +988,10 @@ "GEOM: %s: GPT rejected -- may not be recoverable.\n", pp->name); } - if (prihdr != NULL) - g_free(prihdr); - if (pritbl != NULL) - g_free(pritbl); - if (sechdr != NULL) - g_free(sechdr); - if (sectbl != NULL) - g_free(sectbl); + g_free(prihdr); + g_free(pritbl); + g_free(sechdr); + g_free(sectbl); return (EINVAL); } @@ -1028,11 +1023,9 @@ "strongly advised.\n", pp->name); table->hdr = sechdr; basetable->gpt_corrupt = 1; - if (prihdr != NULL) - g_free(prihdr); + g_free(prihdr); tbl = sectbl; - if (pritbl != NULL) - g_free(pritbl); + g_free(pritbl); } else { if (table->state[GPT_ELT_SECTBL] != GPT_STATE_OK) { printf("GEOM: %s: the secondary GPT table is corrupt " @@ -1046,11 +1039,9 @@ basetable->gpt_corrupt = 1; } table->hdr = prihdr; - if (sechdr != NULL) - g_free(sechdr); + g_free(sechdr); tbl = pritbl; - if (sectbl != NULL) - g_free(sectbl); + g_free(sectbl); } basetable->gpt_first = table->hdr->hdr_lba_start; diff --git a/sys/geom/vinum/geom_vinum_create.c b/sys/geom/vinum/geom_vinum_create.c --- a/sys/geom/vinum/geom_vinum_create.c +++ b/sys/geom/vinum/geom_vinum_create.c @@ -140,8 +140,7 @@ g_topology_unlock(); G_VINUM_DEBUG(0, "create drive '%s': unable to update " "access counts", d->name); - if (d->hdr != NULL) - g_free(d->hdr); + g_free(d->hdr); g_free(d); return (GV_ERR_CREATE); } diff --git a/sys/geom/vinum/geom_vinum_events.c b/sys/geom/vinum/geom_vinum_events.c --- a/sys/geom/vinum/geom_vinum_events.c +++ b/sys/geom/vinum/geom_vinum_events.c @@ -185,8 +185,7 @@ return; failed: - if (hdr != NULL) - g_free(hdr); + g_free(hdr); g_topology_lock(); g_access(cp, -1, 0, 0); g_detach(cp); diff --git a/sys/geom/vinum/geom_vinum_plex.c b/sys/geom/vinum/geom_vinum_plex.c --- a/sys/geom/vinum/geom_vinum_plex.c +++ b/sys/geom/vinum/geom_vinum_plex.c @@ -858,8 +858,7 @@ */ if (start >= s->drive_offset + s->size) { /* Free the data we initialized. */ - if (data != NULL) - g_free(data); + g_free(data); g_topology_assert_not(); g_topology_lock(); g_access(cp, 0, -1, 0);