Use lldpd_*_cleanup() functions instead of manual free

diff --git a/src/cdp.c b/src/cdp.c
index e5762313f8495b66b18d1c1a0bc05a6596b2dff2..c16193efbb286aa9286a468afb0a33284a3ee56b 100644 (file)
--- 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 aca278a9ebf24e86ba62a42dcdc8313e839c7e14..40b2a907788e2605d63e0039ba6f18f477979264 100644 (file)
--- 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 7a80da39603967c5a334f25f6b4f2703feaa2d2d..755e9184ebb532379b01bdfde5c9fcd4857ed57a 100644 (file)
--- 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 887e17070224980548526f89f278d8fab6c5f937..ab794a2a99224bf174abd9fdeb05fe0332d0f210 100644 (file)
--- 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;
 }