diff options
| author | trasz <trasz@FreeBSD.org> | 2015-11-14 16:06:01 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2015-11-14 16:06:01 +0000 |
| commit | b1195936c35486e25114a9331e2757fa6dae87c4 (patch) | |
| tree | 0c49254d0f9b52cf5104539a60343ab15fab9ca8 /usr.sbin/ctld | |
| parent | beb14530b9cf26092cf5a9f809ee3a0ab22919a2 (diff) | |
| download | FreeBSD-src-b1195936c35486e25114a9331e2757fa6dae87c4.zip FreeBSD-src-b1195936c35486e25114a9331e2757fa6dae87c4.tar.gz | |
Don't try to avoid calling free(3) with NULL argument.
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin/ctld')
| -rw-r--r-- | usr.sbin/ctld/kernel.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index 6f43ac0..4b4e3fa 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -515,8 +515,7 @@ retry_port: STAILQ_FOREACH(port, &devlist.port_list, links) { if (strcmp(port->port_frontend, "ha") == 0) continue; - if (name) - free(name); + free(name); if (port->pp == 0 && port->vp == 0) name = checked_strdup(port->port_name); else if (port->vp == 0) @@ -583,8 +582,7 @@ retry_port: } cp->p_ctl_port = port->port_id; } - if (name) - free(name); + free(name); STAILQ_FOREACH(lun, &devlist.lun_list, links) { struct cctl_lun_nv *nv; |
