[26724] in CVS-changelog-for-Kerberos-V5
krb5 commit: Rename 'free' -> 'free_func' in asn1_encode.c/.h
daemon@ATHENA.MIT.EDU (Sam Hartman)
Mon Jul 16 09:33:21 2012
Date: Mon, 16 Jul 2012 09:33:05 -0400
From: Sam Hartman <hartmans@mit.edu>
Message-Id: <201207161333.q6GDX5Eq012324@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/b19024706abf129e67bd2d8732a9fe09286cd847
commit b19024706abf129e67bd2d8732a9fe09286cd847
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Tue May 15 14:42:24 2012 -0400
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
src/lib/krb5/asn.1/asn1_encode.c | 4 ++--
src/lib/krb5/asn.1/asn1_encode.h | 2 +-
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 395831c..b9770a1 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 347b87d..1262fb3 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 {
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
