[libmicrohttpd] 04/05: mhd_panic: replaced direct function call with the macro

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit fa7e0ae04bb8460400033b2b31172701983635c5
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Tue Jan 25 19:43:07 2022 +0300

    mhd_panic: replaced direct function call with the macro
    
    MHD_PANIC is generally used as a macro, but for some reason function was
    used directly in a few places.
---
 src/microhttpd/connection.c    | 10 +---------
 src/microhttpd/digestauth.c    |  5 ++---
 src/microhttpd/postprocessor.c | 15 +++------------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 2490a1fb..21c4d338 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -3323,15 +3323,7 @@ process_request_body (struct MHD_Connection *connection)
       return;
     }
     if (left_unprocessed > to_be_processed)
-      mhd_panic (mhd_panic_cls,
-                 __FILE__,
-                 __LINE__
-#ifdef HAVE_MESSAGES
-                 , _ ("libmicrohttpd API violation.\n")
-#else
-                 , NULL
-#endif
-                 );
+      MHD_PANIC (_ ("libmicrohttpd API violation.\n"));
     if (0 != left_unprocessed)
     {
       instant_retry = false; /* client did not process everything */
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index 59f999f4..a1b7bcf4 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -83,9 +83,8 @@
 /**
  * Check that @a n is below #MAX_DIGEST
  */
-#define VLA_CHECK_LEN_DIGEST(n) do { if ((n) > MAX_DIGEST) mhd_panic ( \
-                                       mhd_panic_cls, __FILE__, __LINE__, \
-                                       "VLA too big.\n"); } while (0)
+#define VLA_CHECK_LEN_DIGEST(n) \
+  do { if ((n) > MAX_DIGEST) MHD_PANIC (_ ("VLA too big.\n")); } while (0)
 
 
 /**
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c
index 8556624d..0d6a00ab 100644
--- a/src/microhttpd/postprocessor.c
+++ b/src/microhttpd/postprocessor.c
@@ -266,10 +266,7 @@ MHD_create_post_processor (struct MHD_Connection 
*connection,
   if ( (buffer_size < 256) ||
        (NULL == connection) ||
        (NULL == iter))
-    mhd_panic (mhd_panic_cls,
-               __FILE__,
-               __LINE__,
-               NULL);
+    MHD_PANIC (_ ("libmicrohttpd API violation.\n"));
   if (MHD_NO == MHD_lookup_connection_value_n (connection,
                                                MHD_HEADER_KIND,
                                                MHD_HTTP_HEADER_CONTENT_TYPE,
@@ -707,10 +704,7 @@ post_process_urlencoded (struct MHD_PostProcessor *pp,
       pp->state = PP_Init;
       break;
     default:
-      mhd_panic (mhd_panic_cls,
-                 __FILE__,
-                 __LINE__,
-                 NULL);              /* should never happen! */
+      MHD_PANIC (_ ("internal error.\n")); /* should never happen! */
     }
     mhd_assert ((end_key == NULL) || (start_key != NULL));
     mhd_assert ((end_value == NULL) || (start_value != NULL));
@@ -1431,10 +1425,7 @@ post_process_multipart (struct MHD_PostProcessor *pp,
       state_changed = 1;
       break;
     default:
-      mhd_panic (mhd_panic_cls,
-                 __FILE__,
-                 __LINE__,
-                 NULL);              /* should never happen! */
+      MHD_PANIC (_ ("internal error.\n")); /* should never happen! */
     }
 AGAIN:
     if (ioff > 0)

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