From: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Tue, 15 May 2012 18:42:24 +0000 (-0400)
Subject: Rename 'free' -> 'free_func' in asn1_encode.c/.h
X-Git-Tag: krb5-1.11-alpha1~413
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b19024706abf129e67bd2d8732a9fe09286cd847;p=thirdparty%2Fkrb5.git

Rename 'free' -> 'free_func' in asn1_encode.c/.h

MSVC memory tracking tools do '#define free(p) _dbg_free(...)'.

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

ticket: 7205 (new)
tags: pullup
---

diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c
index 395831c1ad..b9770a1095 100644
--- a/src/lib/krb5/asn.1/asn1_encode.c
+++ b/src/lib/krb5/asn.1/asn1_encode.c
@@ -952,8 +952,8 @@ free_atype(const struct atype_info *a, void *val)
     switch (a->type) {
     case atype_fn: {
         const struct fn_info *fn = a->tinfo;
-        if (fn->free != NULL)
-            fn->free(val);
+        if (fn->free_func != NULL)
+            fn->free_func(val);
         break;
     }
     case atype_sequence:
diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h
index 347b87d268..1262fb3734 100644
--- a/src/lib/krb5/asn.1/asn1_encode.h
+++ b/src/lib/krb5/asn.1/asn1_encode.h
@@ -156,7 +156,7 @@ struct fn_info {
     asn1_error_code (*dec)(const taginfo *, const unsigned char *, size_t,
                            void *);
     int (*check_tag)(const taginfo *);
-    void (*free)(void *);
+    void (*free_func)(void *);
 };
 
 struct ptr_info {