Pārlūkot izejas kodu

MHD_*_get_info_*(): used function and parameters attributes

Evgeny Grin (Karlson2k) 1 gadu atpakaļ
vecāks
revīzija
b4b772fcce

+ 25 - 22
src/include/microhttpd2.h

@@ -1,6 +1,6 @@
 /*
   This file is part of GNU libmicrohttpd
-  Copyright (C) 2006-2024 Christian Grothoff, Karlson2k (Evgeny Grin)
+  Copyright (C) 2006-2025 Christian Grothoff, Karlson2k (Evgeny Grin)
   (and other contributing authors)
 
   GNU libmicrohttpd is free software; you can redistribute it and/or
@@ -8988,7 +8988,7 @@ union MHD_LibInfoFixedData
  */
 MHD_EXTERN_ enum MHD_StatusCode
 MHD_lib_get_info_fixed_sz (enum MHD_LibInfoFixed info_type,
-                           union MHD_LibInfoFixedData *output_buf,
+                           union MHD_LibInfoFixedData *MHD_RESTRICT output_buf,
                            size_t output_buf_size)
 MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_OUT_ (2);
 
@@ -9136,10 +9136,11 @@ union MHD_LibInfoDynamicData
  * @ingroup specialized
  */
 MHD_EXTERN_ enum MHD_StatusCode
-MHD_lib_get_info_dynamic_sz (enum MHD_LibInfoDynamic info_type,
-                             union MHD_LibInfoDynamicData *output_buf,
-                             size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_OUT_ (2);
+MHD_lib_get_info_dynamic_sz (
+  enum MHD_LibInfoDynamic info_type,
+  union MHD_LibInfoDynamicData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_OUT_ (2);
 
 /**
  * Get dynamic information about MHD that may be changed at run-time.
@@ -9291,11 +9292,12 @@ union MHD_DaemonInfoFixedData
  * @ingroup specialized
  */
 MHD_EXTERN_ enum MHD_StatusCode
-MHD_daemon_get_info_fixed_sz (struct MHD_Daemon *daemon,
-                              enum MHD_DaemonInfoFixedType info_type,
-                              union MHD_DaemonInfoFixedData *output_buf,
-                              size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (1)
+MHD_daemon_get_info_fixed_sz (
+  struct MHD_Daemon *MHD_RESTRICT daemon,
+  enum MHD_DaemonInfoFixedType info_type,
+  union MHD_DaemonInfoFixedData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3);
 
 /**
@@ -9421,11 +9423,12 @@ union MHD_DaemonInfoDynamicData
  * @ingroup specialized
  */
 MHD_EXTERN_ enum MHD_StatusCode
-MHD_daemon_get_info_dynamic_sz (struct MHD_Daemon *daemon,
-                                enum MHD_DaemonInfoDynamicType info_type,
-                                union MHD_DaemonInfoDynamicData *output_buf,
-                                size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (1)
+MHD_daemon_get_info_dynamic_sz (
+  struct MHD_Daemon *MHD_RESTRICT daemon,
+  enum MHD_DaemonInfoDynamicType info_type,
+  union MHD_DaemonInfoDynamicData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3);
 
 /**
@@ -9569,11 +9572,11 @@ union MHD_ConnectionInfoFixedData
  */
 MHD_EXTERN_ enum MHD_StatusCode
 MHD_connection_get_info_fixed_sz (
-  struct MHD_Connection *connection,
+  struct MHD_Connection *MHD_RESTRICT connection,
   enum MHD_ConnectionInfoFixedType info_type,
-  union MHD_ConnectionInfoFixedData *output_buf,
+  union MHD_ConnectionInfoFixedData *MHD_RESTRICT output_buf,
   size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (1)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3);
 
 
@@ -9824,11 +9827,11 @@ union MHD_ConnectionInfoDynamicData
  */
 MHD_EXTERN_ enum MHD_StatusCode
 MHD_connection_get_info_dynamic_sz (
-  struct MHD_Connection *connection,
+  struct MHD_Connection *MHD_RESTRICT connection,
   enum MHD_ConnectionInfoDynamicType info_type,
-  union MHD_ConnectionInfoDynamicData *output_buf,
+  union MHD_ConnectionInfoDynamicData *MHD_RESTRICT output_buf,
   size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (1)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3);
 
 

+ 24 - 21
src/include/microhttpd2_main.h.in

@@ -4366,7 +4366,7 @@ union MHD_LibInfoFixedData
  */
 MHD_EXTERN_ enum MHD_StatusCode
 MHD_lib_get_info_fixed_sz (enum MHD_LibInfoFixed info_type,
-                           union MHD_LibInfoFixedData *output_buf,
+                           union MHD_LibInfoFixedData *MHD_RESTRICT output_buf,
                            size_t output_buf_size)
 MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_OUT_ (2);
 
@@ -4514,10 +4514,11 @@ union MHD_LibInfoDynamicData
  * @ingroup specialized
  */
 MHD_EXTERN_ enum MHD_StatusCode
-MHD_lib_get_info_dynamic_sz (enum MHD_LibInfoDynamic info_type,
-                             union MHD_LibInfoDynamicData *output_buf,
-                             size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_OUT_ (2);
+MHD_lib_get_info_dynamic_sz (
+  enum MHD_LibInfoDynamic info_type,
+  union MHD_LibInfoDynamicData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_OUT_ (2);
 
 /**
  * Get dynamic information about MHD that may be changed at run-time.
@@ -4669,11 +4670,12 @@ union MHD_DaemonInfoFixedData
  * @ingroup specialized
  */
 MHD_EXTERN_ enum MHD_StatusCode
-MHD_daemon_get_info_fixed_sz (struct MHD_Daemon *daemon,
-                              enum MHD_DaemonInfoFixedType info_type,
-                              union MHD_DaemonInfoFixedData *output_buf,
-                              size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (1)
+MHD_daemon_get_info_fixed_sz (
+  struct MHD_Daemon *MHD_RESTRICT daemon,
+  enum MHD_DaemonInfoFixedType info_type,
+  union MHD_DaemonInfoFixedData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3);
 
 /**
@@ -4799,11 +4801,12 @@ union MHD_DaemonInfoDynamicData
  * @ingroup specialized
  */
 MHD_EXTERN_ enum MHD_StatusCode
-MHD_daemon_get_info_dynamic_sz (struct MHD_Daemon *daemon,
-                                enum MHD_DaemonInfoDynamicType info_type,
-                                union MHD_DaemonInfoDynamicData *output_buf,
-                                size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (1)
+MHD_daemon_get_info_dynamic_sz (
+  struct MHD_Daemon *MHD_RESTRICT daemon,
+  enum MHD_DaemonInfoDynamicType info_type,
+  union MHD_DaemonInfoDynamicData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3);
 
 /**
@@ -4947,11 +4950,11 @@ union MHD_ConnectionInfoFixedData
  */
 MHD_EXTERN_ enum MHD_StatusCode
 MHD_connection_get_info_fixed_sz (
-  struct MHD_Connection *connection,
+  struct MHD_Connection *MHD_RESTRICT connection,
   enum MHD_ConnectionInfoFixedType info_type,
-  union MHD_ConnectionInfoFixedData *output_buf,
+  union MHD_ConnectionInfoFixedData *MHD_RESTRICT output_buf,
   size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (1)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3);
 
 
@@ -5202,11 +5205,11 @@ union MHD_ConnectionInfoDynamicData
  */
 MHD_EXTERN_ enum MHD_StatusCode
 MHD_connection_get_info_dynamic_sz (
-  struct MHD_Connection *connection,
+  struct MHD_Connection *MHD_RESTRICT connection,
   enum MHD_ConnectionInfoDynamicType info_type,
-  union MHD_ConnectionInfoDynamicData *output_buf,
+  union MHD_ConnectionInfoDynamicData *MHD_RESTRICT output_buf,
   size_t output_buf_size)
-MHD_FN_PAR_NONNULL_ (1)
+MHD_FN_MUST_CHECK_RESULT_ MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3);
 
 

+ 1 - 1
src/include/microhttpd2_preamble.h.in

@@ -1,6 +1,6 @@
 /*
   This file is part of GNU libmicrohttpd
-  Copyright (C) 2006-2024 Christian Grothoff, Karlson2k (Evgeny Grin)
+  Copyright (C) 2006-2025 Christian Grothoff, Karlson2k (Evgeny Grin)
   (and other contributing authors)
 
   GNU libmicrohttpd is free software; you can redistribute it and/or

+ 6 - 6
src/mhd2/conn_get_info.c

@@ -37,13 +37,13 @@
 
 #include "mhd_public_api.h"
 
-MHD_EXTERN_
+MHD_EXTERN_ MHD_FN_MUST_CHECK_RESULT_
 MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3) enum MHD_StatusCode
 MHD_connection_get_info_fixed_sz (
-  struct MHD_Connection *connection,
+  struct MHD_Connection *MHD_RESTRICT connection,
   enum MHD_ConnectionInfoFixedType info_type,
-  union MHD_ConnectionInfoFixedData *output_buf,
+  union MHD_ConnectionInfoFixedData *MHD_RESTRICT output_buf,
   size_t output_buf_size)
 {
   switch (info_type)
@@ -83,13 +83,13 @@ MHD_connection_get_info_fixed_sz (
 }
 
 
-MHD_EXTERN_
+MHD_EXTERN_ MHD_FN_MUST_CHECK_RESULT_
 MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3) enum MHD_StatusCode
 MHD_connection_get_info_dynamic_sz (
-  struct MHD_Connection *connection,
+  struct MHD_Connection *MHD_RESTRICT connection,
   enum MHD_ConnectionInfoDynamicType info_type,
-  union MHD_ConnectionInfoDynamicData *output_buf,
+  union MHD_ConnectionInfoDynamicData *MHD_RESTRICT output_buf,
   size_t output_buf_size)
 {
   switch (info_type)

+ 12 - 10
src/mhd2/daemon_get_info.c

@@ -43,13 +43,14 @@
 
 #include "mhd_public_api.h"
 
-MHD_EXTERN_
+MHD_EXTERN_ MHD_FN_MUST_CHECK_RESULT_
 MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3) enum MHD_StatusCode
-MHD_daemon_get_info_fixed_sz (struct MHD_Daemon *daemon,
-                              enum MHD_DaemonInfoFixedType info_type,
-                              union MHD_DaemonInfoFixedData *output_buf,
-                              size_t output_buf_size)
+MHD_daemon_get_info_fixed_sz (
+  struct MHD_Daemon *MHD_RESTRICT daemon,
+  enum MHD_DaemonInfoFixedType info_type,
+  union MHD_DaemonInfoFixedData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
 {
   if (mhd_DAEMON_STATE_STARTED > daemon->state)
     return MHD_SC_TOO_EARLY;
@@ -138,13 +139,14 @@ MHD_daemon_get_info_fixed_sz (struct MHD_Daemon *daemon,
 }
 
 
-MHD_EXTERN_
+MHD_EXTERN_ MHD_FN_MUST_CHECK_RESULT_
 MHD_FN_PAR_NONNULL_ (1)
 MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3) enum MHD_StatusCode
-MHD_daemon_get_info_dynamic_sz (struct MHD_Daemon *daemon,
-                                enum MHD_DaemonInfoDynamicType info_type,
-                                union MHD_DaemonInfoDynamicData *output_buf,
-                                size_t output_buf_size)
+MHD_daemon_get_info_dynamic_sz (
+  struct MHD_Daemon *MHD_RESTRICT daemon,
+  enum MHD_DaemonInfoDynamicType info_type,
+  union MHD_DaemonInfoDynamicData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
 {
   if (mhd_DAEMON_STATE_STARTED > daemon->state)
     return MHD_SC_TOO_EARLY;

+ 6 - 5
src/mhd2/lib_get_info.c

@@ -80,7 +80,7 @@
 MHD_EXTERN_
 MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_OUT_ (2) enum MHD_StatusCode
 MHD_lib_get_info_fixed_sz (enum MHD_LibInfoFixed info_type,
-                           union MHD_LibInfoFixedData *output_buf,
+                           union MHD_LibInfoFixedData *MHD_RESTRICT output_buf,
                            size_t output_buf_size)
 {
   switch (info_type)
@@ -435,12 +435,13 @@ MHD_lib_get_info_fixed_sz (enum MHD_LibInfoFixed info_type,
 }
 
 
-MHD_EXTERN_
+MHD_EXTERN_ MHD_FN_MUST_CHECK_RESULT_
 MHD_FN_PAR_NONNULL_ (2)
 MHD_FN_PAR_OUT_ (2) enum MHD_StatusCode
-MHD_lib_get_info_dynamic_sz (enum MHD_LibInfoDynamic info_type,
-                             union MHD_LibInfoDynamicData *output_buf,
-                             size_t output_buf_size)
+MHD_lib_get_info_dynamic_sz (
+  enum MHD_LibInfoDynamic info_type,
+  union MHD_LibInfoDynamicData *MHD_RESTRICT output_buf,
+  size_t output_buf_size)
 {
   switch (info_type)
   {