summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKevin Wasserman <kevin.wasserman@painless-security.com>2012-05-15 14:42:24 -0400
committerSam Hartman <hartmans@mit.edu>2012-07-16 09:31:14 -0400
commitb19024706abf129e67bd2d8732a9fe09286cd847 (patch)
tree449e233c7837cb4f6a328b5c781e3a065767eec6 /src
parent0a27c56e300990909317630e626ccdd8ae8e7f41 (diff)
downloadkrb5-b19024706abf129e67bd2d8732a9fe09286cd847.tar.gz
krb5-b19024706abf129e67bd2d8732a9fe09286cd847.tar.xz
krb5-b19024706abf129e67bd2d8732a9fe09286cd847.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/asn.1/asn1_encode.c4
-rw-r--r--src/lib/krb5/asn.1/asn1_encode.h2
2 files changed, 3 insertions, 3 deletions
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 {