krb5 commit: __func__ -> __FUNCTION__ in disp_status.c

Sam Hartman hartmans at MIT.EDU
Mon Jul 16 09:33:08 EDT 2012


https://github.com/krb5/krb5/commit/0552f29887201227788d1ca3df9d2b2c4f2447d2
commit 0552f29887201227788d1ca3df9d2b2c4f2447d2
Author: Kevin Wasserman <kevin.wasserman at painless-security.com>
Date:   Tue May 15 14:23:59 2012 -0400

    __func__ -> __FUNCTION__ in disp_status.c
    
    For MSVC compatibility
    
    Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
    
    ticket: 7208 (new)
    tags: pullup

 src/lib/gssapi/krb5/disp_status.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c
index d33ad7f..69c3cb9 100644
--- a/src/lib/gssapi/krb5/disp_status.c
+++ b/src/lib/gssapi/krb5/disp_status.c
@@ -48,7 +48,7 @@ char *get_error_message(OM_uint32 minor_code)
     gsserrmap *p = k5_getspecific(K5_KEY_GSS_KRB5_ERROR_MESSAGE);
     char *msg = NULL;
 #ifdef DEBUG
-    fprintf(stderr, "%s(%lu, p=%p)", __func__, (unsigned long) minor_code,
+    fprintf(stderr, "%s(%lu, p=%p)", __FUNCTION__, (unsigned long) minor_code,
             (void *) p);
 #endif
     if (p) {
@@ -74,7 +74,7 @@ static int save_error_string_nocopy(OM_uint32 minor_code, char *msg)
     int ret;
 
 #ifdef DEBUG
-    fprintf(stderr, "%s(%lu, %s)", __func__, (unsigned long) minor_code, msg);
+    fprintf(stderr, "%s(%lu, %s)", __FUNCTION__, (unsigned long) minor_code, msg);
 #endif
     p = k5_getspecific(K5_KEY_GSS_KRB5_ERROR_MESSAGE);
     if (!p) {
@@ -131,12 +131,12 @@ void krb5_gss_save_error_info(OM_uint32 minor_code, krb5_context ctx)
     char *s;
 
 #ifdef DEBUG
-    fprintf(stderr, "%s(%lu, ctx=%p)\n", __func__,
+    fprintf(stderr, "%s(%lu, ctx=%p)\n", __FUNCTION__,
             (unsigned long) minor_code, (void *)ctx);
 #endif
     s = (char *)krb5_get_error_message(ctx, (krb5_error_code)minor_code);
 #ifdef DEBUG
-    fprintf(stderr, "%s(%lu, ctx=%p) saving: %s\n", __func__,
+    fprintf(stderr, "%s(%lu, ctx=%p) saving: %s\n", __FUNCTION__,
             (unsigned long) minor_code, (void *)ctx, s);
 #endif
     save_error_string(minor_code, s);


More information about the cvs-krb5 mailing list