From: Vincent Bernat <bernat@luffy.cx>
Date: Wed, 26 Nov 2008 18:24:43 +0000 (+0100)
Subject: Use lldpd_*_cleanup() functions instead of manual free
X-Git-Tag: 0.3~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3322e2362d32553bc63e712ec34522ddb6722f1;p=thirdparty%2Flldpd.git

Use lldpd_*_cleanup() functions instead of manual free
---

diff --git a/src/cdp.c b/src/cdp.c
index e5762313..c16193ef 100644
--- a/src/cdp.c
+++ b/src/cdp.c
@@ -441,16 +441,8 @@ cdp_decode(struct lldpd *cfg, char *frame, int s,
 	return 1;
 
 malformed:
-	free(chassis->c_name);
-	free(chassis->c_id);
-	free(chassis->c_descr);
-	free(chassis);
-	free(port->p_id);
-	free(port->p_descr);
-#ifdef ENABLE_DOT1
-	lldpd_vlan_cleanup(port);
-#endif
-	free(port);
+	lldpd_chassis_cleanup(chassis);
+	lldpd_port_cleanup(port);
 	return -1;
 }
 
diff --git a/src/edp.c b/src/edp.c
index aca278a9..40b2a907 100644
--- a/src/edp.c
+++ b/src/edp.c
@@ -480,16 +480,8 @@ edp_decode(struct lldpd *cfg, char *frame, int s,
 	return 1;
 
 malformed:
-	free(chassis->c_id);
-	free(chassis->c_descr);
-	free(chassis->c_name);
-	free(chassis);
-	free(port->p_id);
-	free(port->p_descr);
-#ifdef ENABLE_DOT1
-	lldpd_vlan_cleanup(port);
-#endif
-	free(port);
+	lldpd_chassis_cleanup(chassis);
+	lldpd_port_cleanup(port);
 	return -1;
 }
 
diff --git a/src/lldp.c b/src/lldp.c
index 7a80da39..755e9184 100644
--- a/src/lldp.c
+++ b/src/lldp.c
@@ -735,23 +735,7 @@ lldp_decode(struct lldpd *cfg, char *frame, int s,
 	*newport = port;
 	return 1;
 malformed:
-#ifdef ENABLE_LLDPMED
-	free(chassis->c_med_hw);
-	free(chassis->c_med_fw);
-	free(chassis->c_med_sn);
-	free(chassis->c_med_manuf);
-	free(chassis->c_med_model);
-	free(chassis->c_med_asset);
-#endif
-	free(chassis->c_id);
-	free(chassis->c_name);
-	free(chassis->c_descr);
-	free(chassis);
-	free(port->p_id);
-	free(port->p_descr);
-#ifdef ENABLE_DOT1
-	lldpd_vlan_cleanup(port);
-#endif
-	free(port);
+	lldpd_chassis_cleanup(chassis);
+	lldpd_port_cleanup(port);
 	return -1;
 }
diff --git a/src/sonmp.c b/src/sonmp.c
index 887e1707..ab794a2a 100644
--- a/src/sonmp.c
+++ b/src/sonmp.c
@@ -329,13 +329,8 @@ sonmp_decode(struct lldpd *cfg, char *frame, int s,
 	return 1;
 
 malformed:
-	free(chassis->c_id);
-	free(chassis->c_name);
-	free(chassis->c_descr);
-	free(chassis);
-	free(port->p_id);
-	free(port->p_descr);
-	free(port);
+	lldpd_chassis_cleanup(chassis);
+	lldpd_port_cleanup(port);
 	return -1;
 }