[libmicrohttpd] 120/156: Simplified usage of the function name magic macros

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to tag v0.9.77
in repository libmicrohttpd.

commit a88af55d0f8fcccbb1c3591318bbd56515f93d3b
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Fri May 19 14:26:43 2023 +0300

    Simplified usage of the function name magic macros
---
 src/include/mhd_options.h   | 15 +++++++++++++++
 src/microhttpd/connection.c |  8 ++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/include/mhd_options.h b/src/include/mhd_options.h
index a4cc0a36..75fd7b76 100644
--- a/src/include/mhd_options.h
+++ b/src/include/mhd_options.h
@@ -166,4 +166,19 @@
 #endif /* ! (MHD_ASAN_ACTIVE && HAVE_SANITIZER_ASAN_INTERFACE_H &&
            (FUNC_ATTR_PTRCOMPARE_WOKRS || FUNC_ATTR_NOSANITIZE_WORKS))   */
 
+
+/**
+ * Automatic string with the name of the current function
+ */
+#if defined(HAVE___FUNC__)
+#define MHD_FUNC_       __func__
+#elif defined(HAVE___FUNCTION__)
+#define MHD_FUNC_       __FUNCTION__
+#elif defined(HAVE___PRETTY_FUNCTION__)
+#define MHD_FUNC_       __PRETTY_FUNCTION__
+#else
+#define MHD_FUNC_       "**name unavailable**"
+#endif
+
+
 #endif /* MHD_OPTIONS_H */
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 2aa6344d..8ed4fa36 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -2433,7 +2433,7 @@ MHD_connection_update_event_loop_info (struct 
MHD_Connection *connection)
 #if DEBUG_STATES
     MHD_DLOG (connection->daemon,
               _ ("In function %s handling connection at state: %s\n"),
-              __FUNCTION__,
+              MHD_FUNC_,
               MHD_state_to_string (connection->state));
 #endif
     switch (connection->state)
@@ -3767,7 +3767,7 @@ MHD_connection_handle_read (struct MHD_Connection 
*connection,
 #if DEBUG_STATES
   MHD_DLOG (connection->daemon,
             _ ("In function %s handling connection at state: %s\n"),
-            __FUNCTION__,
+            MHD_FUNC_,
             MHD_state_to_string (connection->state));
 #endif
   switch (connection->state)
@@ -3844,7 +3844,7 @@ MHD_connection_handle_write (struct MHD_Connection 
*connection)
 #if DEBUG_STATES
   MHD_DLOG (connection->daemon,
             _ ("In function %s handling connection at state: %s\n"),
-            __FUNCTION__,
+            MHD_FUNC_,
             MHD_state_to_string (connection->state));
 #endif
   switch (connection->state)
@@ -4409,7 +4409,7 @@ MHD_connection_handle_idle (struct MHD_Connection 
*connection)
 #if DEBUG_STATES
     MHD_DLOG (daemon,
               _ ("In function %s handling connection at state: %s\n"),
-              __FUNCTION__,
+              MHD_FUNC_,
               MHD_state_to_string (connection->state));
 #endif
     switch (connection->state)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.