Hi,
Here a first sets of "if(x) free(x)" cleanup in sys/arch/
This patch contains only trivial if(x) removal. The size argument in
free is keep untouched (because it is already setted, or because it
makes sens to keep it to 0).
Comments ? OK ?
--
Sebastien Marie
Index: b/sys/arch/amd64/stand/libsa/biosdev.c
===================================================================
--- a/sys/arch/amd64/stand/libsa/biosdev.c 2015-09-12 10:35:37.034830676
+0200
+++ b/sys/arch/amd64/stand/libsa/biosdev.c 2015-09-12 10:36:00.744851935
+0200
@@ -327,8 +327,7 @@ biosd_io(int rw, bios_diskinfo_t *bd, u_
if (bb != buf && rw == F_READ)
bcopy(bb, buf, bbsize);
- if (bb1 != NULL)
- free(bb1, bbsize);
+ free(bb1, bbsize);
#ifdef BIOS_DEBUG
if (debug) {
Index: b/sys/arch/i386/stand/libsa/biosdev.c
===================================================================
--- a/sys/arch/i386/stand/libsa/biosdev.c 2015-09-04 06:33:40.953443448
+0200
+++ b/sys/arch/i386/stand/libsa/biosdev.c 2015-09-12 10:33:57.324705255
+0200
@@ -328,8 +328,7 @@ biosd_io(int rw, bios_diskinfo_t *bd, u_
if (bb != buf && rw == F_READ)
bcopy(bb, buf, bbsize);
- if (bb1 != NULL)
- free(bb1, bbsize);
+ free(bb1, bbsize);
#ifdef BIOS_DEBUG
if (debug) {
Index: b/sys/arch/loongson/dev/bonito.c
===================================================================
--- a/sys/arch/loongson/dev/bonito.c 2015-09-10 06:14:11.727624362 +0200
+++ b/sys/arch/loongson/dev/bonito.c 2015-09-12 10:39:25.345205004 +0200
@@ -1203,8 +1203,7 @@ bonito_get_resource_extent(pci_chipset_t
#endif
out:
- if (exname != NULL)
- free(exname, M_DEVBUF, exnamesz);
+ free(exname, M_DEVBUF, exnamesz);
return ex;
}
Index: b/sys/arch/macppc/macppc/openprom.c
===================================================================
--- a/sys/arch/macppc/macppc/openprom.c 2014-07-19 17:34:21.000000000 +0200
+++ b/sys/arch/macppc/macppc/openprom.c 2015-09-12 10:41:28.745289870 +0200
@@ -255,10 +255,8 @@ openpromioctl(dev_t dev, u_long cmd, cad
return (ENOTTY);
}
- if (name)
- free(name, M_TEMP, 0);
- if (value)
- free(value, M_TEMP, 0);
+ free(name, M_TEMP, 0);
+ free(value, M_TEMP, 0);
return (error);
}
Index: b/sys/arch/sgi/sgi/l1.c
===================================================================
--- a/sys/arch/sgi/sgi/l1.c 2015-09-10 06:14:14.617676019 +0200
+++ b/sys/arch/sgi/sgi/l1.c 2015-09-12 10:45:56.375547158 +0200
@@ -770,8 +770,7 @@ l1_read_board_ia(int16_t nasid, int type
return 0;
fail:
- if (ia != NULL)
- free(ia, M_DEVBUF, ialen);
+ free(ia, M_DEVBUF, ialen);
return rc;
}
@@ -1187,8 +1186,7 @@ l1_get_brick_spd_record(int16_t nasid, i
return 0;
fail:
- if (spd != NULL)
- free(spd, M_DEVBUF, spdlen);
+ free(spd, M_DEVBUF, spdlen);
return rc;
}
Index: b/sys/arch/sparc/sparc/clock.c
===================================================================
--- a/sys/arch/sparc/sparc/clock.c 2015-09-12 10:50:55.095612714 +0200
+++ b/sys/arch/sparc/sparc/clock.c 2015-09-12 10:51:49.125685092 +0200
@@ -1125,8 +1125,7 @@ eeprom_uio(uio)
error = eeprom_update(buf, (size_t)off, cnt);
out:
- if (buf)
- free(buf, M_DEVBUF, 0);
+ free(buf, M_DEVBUF, EEPROM_SIZE);
eeprom_give();
return (error);
#else /* ! SUN4 */
Index: b/sys/arch/sparc/sparc/openprom.c
===================================================================
--- a/sys/arch/sparc/sparc/openprom.c 2015-09-12 10:50:55.005612242 +0200
+++ b/sys/arch/sparc/sparc/openprom.c 2015-09-12 10:51:49.115685124 +0200
@@ -245,10 +245,8 @@ openpromioctl(dev, cmd, data, flags, p)
return (ENOTTY);
}
- if (name)
- free(name, M_TEMP, 0);
- if (value)
- free(value, M_TEMP, 0);
+ free(name, M_TEMP, 0);
+ free(value, M_TEMP, 0);
return (error);
}
Index: b/sys/arch/sparc/stand/common/dvma.c
===================================================================
--- a/sys/arch/sparc/stand/common/dvma.c 2014-07-19 17:34:30.000000000
+0200
+++ b/sys/arch/sparc/stand/common/dvma.c 2015-09-12 11:03:34.546042656
+0200
@@ -142,6 +142,5 @@ dvma_free(char *dvma, int len)
char *mem;
mem = dvma_mapout(dvma, len);
- if (mem)
- free(mem, len);
+ free(mem, len);
}
Index: b/sys/arch/sparc64/dev/fhc.c
===================================================================
--- a/sys/arch/sparc64/dev/fhc.c 2015-09-12 11:08:22.576274652 +0200
+++ b/sys/arch/sparc64/dev/fhc.c 2015-09-12 11:08:32.186276302 +0200
@@ -117,14 +117,10 @@ fhc_attach(struct fhc_softc *sc)
(void)config_found(&sc->sc_dv, (void *)&fa, fhc_print);
- if (fa.fa_name != NULL)
- free(fa.fa_name, M_DEVBUF, 0);
- if (fa.fa_reg != NULL)
- free(fa.fa_reg, M_DEVBUF, 0);
- if (fa.fa_intr != NULL)
- free(fa.fa_intr, M_DEVBUF, 0);
- if (fa.fa_promvaddrs != NULL)
- free(fa.fa_promvaddrs, M_DEVBUF, 0);
+ free(fa.fa_name, M_DEVBUF, 0);
+ free(fa.fa_reg, M_DEVBUF, 0);
+ free(fa.fa_intr, M_DEVBUF, 0);
+ free(fa.fa_promvaddrs, M_DEVBUF, 0);
}
sc->sc_blink.bl_func = fhc_led_blink;
Index: b/sys/arch/sparc64/dev/sbus.c
===================================================================
--- a/sys/arch/sparc64/dev/sbus.c 2014-12-11 09:31:50.000000000 +0100
+++ b/sys/arch/sparc64/dev/sbus.c 2015-09-12 11:04:34.236064550 +0200
@@ -485,17 +485,10 @@ sbus_setup_attach_args(struct sbus_softc
void
sbus_destroy_attach_args(struct sbus_attach_args *sa)
{
- if (sa->sa_name != NULL)
- free(sa->sa_name, M_DEVBUF, 0);
-
- if (sa->sa_nreg != 0)
- free(sa->sa_reg, M_DEVBUF, 0);
-
- if (sa->sa_intr)
- free(sa->sa_intr, M_DEVBUF, 0);
-
- if (sa->sa_promvaddrs)
- free((void *)sa->sa_promvaddrs, M_DEVBUF, 0);
+ free(sa->sa_name, M_DEVBUF, 0);
+ free(sa->sa_reg, M_DEVBUF, 0);
+ free(sa->sa_intr, M_DEVBUF, 0);
+ free((void *)sa->sa_promvaddrs, M_DEVBUF, 0);
bzero(sa, sizeof(struct sbus_attach_args)); /*DEBUG*/
}
Index: b/sys/arch/sparc64/sparc64/autoconf.c
===================================================================
--- a/sys/arch/sparc64/sparc64/autoconf.c 2015-09-12 11:08:22.846274744
+0200
+++ b/sys/arch/sparc64/sparc64/autoconf.c 2015-09-12 11:08:32.206285177
+0200
@@ -1077,8 +1077,7 @@ extern bus_space_tag_t mainbus_space_tag
&ma.ma_naddress, (void **)&ma.ma_address);
if (rv != 0 && rv != ENOENT) {
free(ma.ma_reg, M_DEVBUF, 0);
- if (ma.ma_ninterrupts)
- free(ma.ma_interrupts, M_DEVBUF, 0);
+ free(ma.ma_interrupts, M_DEVBUF, 0);
continue;
}
#ifdef DEBUG
@@ -1092,10 +1091,8 @@ extern bus_space_tag_t mainbus_space_tag
#endif
config_found(dev, &ma, mbprint);
free(ma.ma_reg, M_DEVBUF, 0);
- if (ma.ma_ninterrupts)
- free(ma.ma_interrupts, M_DEVBUF, 0);
- if (ma.ma_naddress)
- free(ma.ma_address, M_DEVBUF, 0);
+ free(ma.ma_interrupts, M_DEVBUF, 0);
+ free(ma.ma_address, M_DEVBUF, 0);
}
extern int prom_cngetc(dev_t);
Index: b/sys/arch/sparc64/sparc64/openprom.c
===================================================================
--- a/sys/arch/sparc64/sparc64/openprom.c 2015-02-15 14:32:53.000000000
+0100
+++ b/sys/arch/sparc64/sparc64/openprom.c 2015-09-12 11:08:51.096316729
+0200
@@ -309,10 +309,8 @@ openpromioctl(dev, cmd, data, flags, p)
return (ENOTTY);
}
- if (name)
- free(name, M_TEMP, 0);
- if (value)
- free(value, M_TEMP, 0);
+ free(name, M_TEMP, 0);
+ free(value, M_TEMP, 0);
return (error);
}
