From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 8 Oct 2012 22:16:43 +0000 (+0000)
Subject: Removed __func__ usage which is c99.
X-Git-Tag: 2.5.0-alpha~6218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1de0d804da2faf3f3db8c6d70c84b658d006b6fc;p=thirdparty%2Fapache%2Fhttpd.git

Removed __func__ usage which is c99.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395792 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/passwd_common.c b/support/passwd_common.c
index d1b10d194b5..ab720279c27 100644
--- a/support/passwd_common.c
+++ b/support/passwd_common.c
@@ -58,7 +58,7 @@ static int generate_salt(char *s, size_t size, const char **errstr,
 
     n = (size * 6 + 7)/8;
     if (n > sizeof(rnd)) {
-        apr_file_printf(errfile, "%s: BUG: Buffer too small", __func__);
+        apr_file_printf(errfile, "generate_salt(): BUG: Buffer too small");
         abort();
     }
     rv = apr_generate_random_bytes(rnd, n);
@@ -242,7 +242,7 @@ int mkhash(struct passwd_ctx *ctx)
 #endif /* BCRYPT_ALGO_SUPPORTED */
 
     default:
-        apr_file_printf(errfile, "%s: BUG: invalid algorithm %d", __func__,
+        apr_file_printf(errfile, "mkhash(): BUG: invalid algorithm %d",
                         ctx->alg);
         abort();
     }
@@ -307,7 +307,9 @@ int parse_common_options(struct passwd_ctx *ctx, char opt,
             break;
         }
     default:
-        apr_file_printf(errfile, "%s: BUG: invalid option %c", __func__, opt);
+        apr_file_printf(errfile, 
+                        "parse_common_options(): BUG: invalid option %c",
+                        opt);
         abort();
     }
     return 0;