From fc363a7097a6e7d46b681ffa20e4b366fc02c555 Mon Sep 17 00:00:00 2001
From: "Evgeny Grin (Karlson2k)" <k2k@narod.ru>
Date: Sat, 31 Aug 2024 12:13:18 +0200
Subject: [PATCH] API: Fixed wrong function attributes

---
 src/include/microhttpd2.h         | 7 +++----
 src/include/microhttpd2_main.h.in | 7 +++----
 src/mhd2/action.c                 | 3 ++-
 src/mhd2/dcc_action.c             | 3 +--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h
index ebd665b9..9b43f7f5 100644
--- a/src/include/microhttpd2.h
+++ b/src/include/microhttpd2.h
@@ -5767,8 +5767,7 @@ MHD_FN_PAR_NONNULL_ (1);
  */
 MHD_EXTERN_ const struct MHD_DynamicContentCreatorAction *
 MHD_DCC_action_suspend (struct MHD_DynamicContentCreatorContext *ctx)
-MHD_FN_PAR_NONNULL_ (1)
-MHD_FN_RETURNS_NONNULL_;
+MHD_FN_PAR_NONNULL_ (1);
 
 /**
  * Create "stop with error" action.
@@ -6083,7 +6082,7 @@ MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3);
  */
 MHD_EXTERN_ const struct MHD_UploadAction *
 MHD_upload_action_suspend (struct MHD_Request *request)
-MHD_FN_RETURNS_NONNULL_ MHD_FN_PAR_NONNULL_ALL_;
+MHD_FN_PAR_NONNULL_ALL_;
 
 /**
  * Converts a @a response to an action.  If #MHD_R_O_REUSABLE
@@ -6128,7 +6127,7 @@ MHD_FN_PAR_NONNULL_ (1);
  */
 MHD_EXTERN_ const struct MHD_UploadAction *
 MHD_upload_action_continue (struct MHD_Request *request)
-MHD_FN_RETURNS_NONNULL_;
+MHD_FN_PAR_NONNULL_ (1);
 
 
 /**
diff --git a/src/include/microhttpd2_main.h.in b/src/include/microhttpd2_main.h.in
index 8c664c96..0fa33a58 100644
--- a/src/include/microhttpd2_main.h.in
+++ b/src/include/microhttpd2_main.h.in
@@ -1403,8 +1403,7 @@ MHD_FN_PAR_NONNULL_ (1);
  */
 MHD_EXTERN_ const struct MHD_DynamicContentCreatorAction *
 MHD_DCC_action_suspend (struct MHD_DynamicContentCreatorContext *ctx)
-MHD_FN_PAR_NONNULL_ (1)
-MHD_FN_RETURNS_NONNULL_;
+MHD_FN_PAR_NONNULL_ (1);
 
 /**
  * Create "stop with error" action.
@@ -1719,7 +1718,7 @@ MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3);
  */
 MHD_EXTERN_ const struct MHD_UploadAction *
 MHD_upload_action_suspend (struct MHD_Request *request)
-MHD_FN_RETURNS_NONNULL_ MHD_FN_PAR_NONNULL_ALL_;
+MHD_FN_PAR_NONNULL_ALL_;
 
 /**
  * Converts a @a response to an action.  If #MHD_R_O_REUSABLE
@@ -1764,7 +1763,7 @@ MHD_FN_PAR_NONNULL_ (1);
  */
 MHD_EXTERN_ const struct MHD_UploadAction *
 MHD_upload_action_continue (struct MHD_Request *request)
-MHD_FN_RETURNS_NONNULL_;
+MHD_FN_PAR_NONNULL_ (1);
 
 
 /**
diff --git a/src/mhd2/action.c b/src/mhd2/action.c
index 0afbb71b..e30ce5bd 100644
--- a/src/mhd2/action.c
+++ b/src/mhd2/action.c
@@ -177,7 +177,8 @@ MHD_upload_action_from_response (struct MHD_Request *request,
 }
 
 
-MHD_EXTERN_ MHD_FN_RETURNS_NONNULL_ const struct MHD_UploadAction *
+MHD_EXTERN_
+MHD_FN_PAR_NONNULL_ (1) const struct MHD_UploadAction *
 MHD_upload_action_continue (struct MHD_Request *request)
 {
   struct MHD_UploadAction *const restrict upl_act =
diff --git a/src/mhd2/dcc_action.c b/src/mhd2/dcc_action.c
index 1f423f3d..6c786eda 100644
--- a/src/mhd2/dcc_action.c
+++ b/src/mhd2/dcc_action.c
@@ -132,8 +132,7 @@ MHD_DCC_action_finish_with_footer (
 
 
 MHD_EXTERN_
-MHD_FN_PAR_NONNULL_ (1)
-MHD_FN_RETURNS_NONNULL_ const struct MHD_DynamicContentCreatorAction *
+MHD_FN_PAR_NONNULL_ (1) const struct MHD_DynamicContentCreatorAction *
 MHD_DCC_action_suspend (struct MHD_DynamicContentCreatorContext *ctx)
 {
   struct MHD_DynamicContentCreatorAction *ret;