use xfree

diff --git a/snmplib/parse.c b/snmplib/parse.c
index 4c6c5e919408ea12d5c8e2fc834c5c6e0651fe59..07d378863db03e311e4f381d8fca6974a6e29cbd 100644 (file)
--- a/snmplib/parse.c
+++ b/snmplib/parse.c
@@ -47,6 +47,8 @@ SOFTWARE.
 
 #include "util.h"
 
+#define free +
+
 /* A quoted string value-- too long for a general "token" */
 char *quoted_string_buffer;
 
@@ -524,11 +526,11 @@ do_subtree(struct tree *root, struct node **nodes)
     oldnp = NULL;
     for (np = child_list; np; np = np->next) {
        if (oldnp)
-           free(oldnp);
+           xfree(oldnp);
        oldnp = np;
     }
     if (oldnp)
-       free(oldnp);
+       xfree(oldnp);
 }
 
 
@@ -601,9 +603,9 @@ free_node(struct node *np)
     while (ep) {
        tep = ep;
        ep = ep->next;
-       free((char *) tep);
+       xfree((char *) tep);
     }
-    free((char *) np);
+    xfree((char *) np);
 }
 
 /*
@@ -686,7 +688,7 @@ parse_objectid(FILE * fp, char *name)
        /* free the oid array */
        for (count = 0, op = oid; count < length; count++, op++) {
            if (op->label)
-               free(op->label);
+               xfree(op->label);
            op->label = 0;
        }
        return root;
@@ -1130,7 +1132,7 @@ parse_objecttype(FILE * fp, char *name)
     /* free oid array */
     for (count = 0; count < length; count++) {
        if (oid[count].label)
-           free(oid[count].label);
+           xfree(oid[count].label);
        oid[count].label = 0;
     }
     return np;
@@ -1196,7 +1198,7 @@ parse_objectgroup(FILE * fp, char *name)
     /* free oid array */
     for (count = 0; count < length; count++) {
        if (oid[count].label)
-           free(oid[count].label);
+           xfree(oid[count].label);
        oid[count].label = 0;
     }
     return np;
@@ -1261,7 +1263,7 @@ parse_notificationDefinition(FILE * fp, char *name)
     /* free oid array */
     for (count = 0; count < length; count++) {
        if (oid[count].label)
-           free(oid[count].label);
+           xfree(oid[count].label);
        oid[count].label = 0;
     }
     return np;
@@ -1307,7 +1309,7 @@ parse_compliance(FILE * fp, char *name)
     /* free oid array */
     for (count = 0; count < length; count++) {
        if (oid[count].label)
-           free(oid[count].label);
+           xfree(oid[count].label);
        oid[count].label = 0;
     }
     return np;
@@ -1355,7 +1357,7 @@ parse_moduleIdentity(FILE * fp, char *name)
     /* free oid array */
     for (count = 0; count < length; count++) {
        if (oid[count].label)
-           free(oid[count].label);
+           xfree(oid[count].label);
        oid[count].label = 0;
     }
     return np;

diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
index 1b1f36885578a441b288ac1606949760889b1c74..606f958ec242b4d7047dd9b31f61fddceb5785f9 100644 (file)
--- a/snmplib/snmp_api.c
+++ b/snmplib/snmp_api.c
@@ -64,6 +64,8 @@
 #include <arpa/inet.h>
 #endif
 
+#define free +
+
 #define DEBUG_SNMPTRACE                0       /* set to 1 to print all SNMP actions */
 #define DEBUG_SNMPFULLDUMP     0       /* set to 1 to dump all SNMP packets */
 
@@ -440,7 +442,7 @@ free_one_request(struct snmp_internal_session *isp, struct request_list *orp)
     if (orp->pdu != NULL) {
        snmp_free_pdu(orp->pdu);
     }
-    free((char *) orp);
+    xfree((char *) orp);
 }
 
 /*
@@ -456,7 +458,7 @@ free_request_list(struct request_list *rp)
        rp = rp->next_request;
        if (orp->pdu != NULL)
            snmp_free_pdu(orp->pdu);
-       free((char *) orp);
+       xfree((char *) orp);
     }
 }
 
@@ -486,15 +488,15 @@ snmp_close(struct snmp_session *session)
     /* If we found the session, free all data associated with it */
     if (slp) {
        if (slp->session->community != NULL)
-           free((char *) slp->session->community);
+           xfree((char *) slp->session->community);
        if (slp->session->peername != NULL)
-           free((char *) slp->session->peername);
-       free((char *) slp->session);
+           xfree((char *) slp->session->peername);
+       xfree((char *) slp->session);
        if (slp->internal->sd != -1)
            close(slp->internal->sd);
        free_request_list(slp->internal->requests);
-       free((char *) slp->internal);
-       free((char *) slp);
+       xfree((char *) slp->internal);
+       xfree((char *) slp);
     } else {
        snmp_errno = SNMPERR_BAD_SESSION;
        return 0;
@@ -902,19 +904,19 @@ snmp_free_pdu(struct snmp_pdu *pdu)
     vp = pdu->variables;
     while (vp) {
        if (vp->name) {
-           free((char *) vp->name);
+           xfree((char *) vp->name);
        }
        if (vp->val.string) {
-           free((char *) vp->val.string);
+           xfree((char *) vp->val.string);
        }
        ovp = vp;
        vp = vp->next_variable;
-       free((char *) ovp);
+       xfree((char *) ovp);
     }
     if (pdu->enterprise) {
-       free((char *) pdu->enterprise);
+       xfree((char *) pdu->enterprise);
     }
-    free((char *) pdu);
+    xfree((char *) pdu);
 }