microhttpd2.h: applied formattingm1

author: Evgeny Grin (Karlson2k) <k2k@narod.ru> 2024-04-09 12:10:42 +0200
committer: Evgeny Grin (Karlson2k) <k2k@narod.ru> 2024-04-09 12:10:42 +0200
commit: 00c669fca41ba69c41cfc059e3b7033297118a35 (patch)
tree: 4249f670a6058acc7cd7f488ad538c2aa9e66c57
parent: d47c202beb12016cbc98979867a503df3088919d (diff)
download: libmicrohttpd-m1.tar.gz
libmicrohttpd-m1.zip
1 files changed, 42 insertions, 42 deletions
diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h
index ebdcec3d..beba2301 100644
--- a/src/include/microhttpd2.h
+++ b/src/include/microhttpd2.h
@@ -6556,12 +6556,13 @@ MHD_NOWARN_VARIADIC_MACROS_
 * @return ::MHD_SC_OK on success,
 *         error code otherwise
 */
-#    define MHD_DAEMON_OPTIONS_SET(daemon,...)      \
+#    define MHD_DAEMON_OPTIONS_SET(daemon,...)          \
-        MHD_NOWARN_COMPOUND_LITERALS_                     \
+        MHD_NOWARN_COMPOUND_LITERALS_                   \
-        MHD_daemon_options_set (daemon,                    \
+          MHD_daemon_options_set (                      \
-                                ((const struct MHD_DaemonOptionAndValue[])      \
+          daemon,                                       \
-                                 {__VA_ARGS__, MHD_D_OPTION_TERMINATE ()}),       \
+          ((const struct MHD_DaemonOptionAndValue[])    \
-                                MHD_OPTIONS_ARRAY_MAX_SIZE)                     \
+           {__VA_ARGS__, MHD_D_OPTION_TERMINATE ()}),   \
+          MHD_OPTIONS_ARRAY_MAX_SIZE)                   \
        MHD_RESTORE_WARN_COMPOUND_LITERALS_
 #  elif defined(MHD_USE_CPP_INIT_LIST)
 MHD_C_DECLRATIONS_FINISH_HERE_
@@ -6583,13 +6584,13 @@ MHD_C_DECLRATIONS_START_HERE_
 * @return ::MHD_SC_OK on success,
 *         error code otherwise
 */
-#    define MHD_DAEMON_OPTIONS_SET(daemon,...)      \
+#    define MHD_DAEMON_OPTIONS_SET(daemon,...)                  \
-        MHD_NOWARN_CPP_INIT_LIST_                         \
+        MHD_NOWARN_CPP_INIT_LIST_                               \
-        MHD_daemon_options_set (daemon,                      \
+          MHD_daemon_options_set (                              \
-                                (std::vector<struct MHD_DaemonOptionAndValue>   \
+          daemon,                                               \
-                                 {__VA_ARGS__,MHD_D_OPTION_TERMINATE ()}).data \
+          (std::vector<struct MHD_DaemonOptionAndValue>         \
-                                  (),   \
+           {__VA_ARGS__,MHD_D_OPTION_TERMINATE ()}).data (),    \
-                                MHD_OPTIONS_ARRAY_MAX_SIZE)                     \
+          MHD_OPTIONS_ARRAY_MAX_SIZE)                           \
        MHD_RESTORE_WARN_CPP_INIT_LIST_
 #  endif
 MHD_RESTORE_WARN_VARIADIC_MACROS_
@@ -6895,13 +6896,13 @@ MHD_NOWARN_VARIADIC_MACROS_
 * @return ::MHD_SC_OK on success,
 *         error code otherwise
 */
-#    define MHD_CONNECTION_OPTIONS_SET(connection,...)  \
+#    define MHD_CONNECTION_OPTIONS_SET(connection,...)          \
-        MHD_NOWARN_COMPOUND_LITERALS_                         \
+        MHD_NOWARN_COMPOUND_LITERALS_                           \
-        MHD_connection_options_set (daemon,                    \
+          MHD_connection_options_set (                          \
-                                    ((const struct MHD_ConnectionOptionAndValue \
+          daemon,                                               \
-                                      [])      \
+          ((const struct MHD_ConnectionOptionAndValue [])       \
-                                     {__VA_ARGS__, MHD_C_OPTION_TERMINATE ()}),        \
+           {__VA_ARGS__, MHD_C_OPTION_TERMINATE ()}),           \
-                                    MHD_OPTIONS_ARRAY_MAX_SIZE)                         \
+          MHD_OPTIONS_ARRAY_MAX_SIZE)                           \
        MHD_RESTORE_WARN_COMPOUND_LITERALS_
 #  elif defined(MHD_USE_CPP_INIT_LIST)
 MHD_C_DECLRATIONS_FINISH_HERE_
@@ -6922,14 +6923,13 @@ MHD_C_DECLRATIONS_START_HERE_
 * @return ::MHD_SC_OK on success,
 *         error code otherwise
 */
-#    define MHD_CONNECTION_OPTIONS_SET(daemon,...)      \
+#    define MHD_CONNECTION_OPTIONS_SET(daemon,...)              \
-        MHD_NOWARN_CPP_INIT_LIST_                             \
+        MHD_NOWARN_CPP_INIT_LIST_                               \
-        MHD_daemon_options_set (daemon,                        \
+          MHD_daemon_options_set (                              \
-                                (std::vector<struct MHD_ConnectionOptionAndValue \
+          daemon,                                               \
-                                 >   \
+          (std::vector<struct MHD_ConnectionOptionAndValue>     \
-                                 {__VA_ARGS__,MHD_C_OPTION_TERMINATE ()}).data \
+           {__VA_ARGS__,MHD_C_OPTION_TERMINATE ()}).data (),    \
-                                  (),    \
+          MHD_OPTIONS_ARRAY_MAX_SIZE)                           \
-                                MHD_OPTIONS_ARRAY_MAX_SIZE)                         \
        MHD_RESTORE_WARN_CPP_INIT_LIST_
 #  endif
 MHD_RESTORE_WARN_VARIADIC_MACROS_
@@ -8178,12 +8178,13 @@ MHD_NOWARN_VARIADIC_MACROS_
 * @return ::MHD_SC_OK on success,
 *         error code otherwise
 */
-#    define MHD_RESPONSE_OPTIONS_SET(response,...)      \
+#    define MHD_RESPONSE_OPTIONS_SET(response,...)              \
-        MHD_NOWARN_COMPOUND_LITERALS_                         \
+        MHD_NOWARN_COMPOUND_LITERALS_                           \
-        MHD_response_options_set (response,                      \
+          MHD_response_options_set (                            \
-                                  ((const struct MHD_ResponseOptionAndValue[])        \
+          response,                                             \
-                                   {__VA_ARGS__, MHD_R_OPTION_TERMINATE ()}),        \
+          ((const struct MHD_ResponseOptionAndValue[])          \
-                                  MHD_OPTIONS_ARRAY_MAX_SIZE)                         \
+           {__VA_ARGS__, MHD_R_OPTION_TERMINATE ()}),           \
+          MHD_OPTIONS_ARRAY_MAX_SIZE)                           \
        MHD_RESTORE_WARN_COMPOUND_LITERALS_
 #  elif defined(MHD_USE_CPP_INIT_LIST)
 MHD_C_DECLRATIONS_FINISH_HERE_
@@ -8205,14 +8206,13 @@ MHD_C_DECLRATIONS_START_HERE_
 * @return ::MHD_SC_OK on success,
 *         error code otherwise
 */
-#    define MHD_RESPONSE_OPTIONS_SET(response,...)      \
+#    define MHD_RESPONSE_OPTIONS_SET(response,...)              \
-        MHD_NOWARN_CPP_INIT_LIST_                         \
+        MHD_NOWARN_CPP_INIT_LIST_                               \
-        MHD_response_options_set (response,                      \
+          MHD_response_options_set (                            \
-                                  (std::vector<struct MHD_ResponseOptionAndValue \
+          response,                                             \
-                                   >   \
+          (std::vector<struct MHD_ResponseOptionAndValue>       \
-                                   {__VA_ARGS__,MHD_R_OPTION_TERMINATE ()}).data \
+           {__VA_ARGS__,MHD_R_OPTION_TERMINATE ()}).data (),    \
-                                    (),   \
+          MHD_OPTIONS_ARRAY_MAX_SIZE)                           \
-                                  MHD_OPTIONS_ARRAY_MAX_SIZE)                     \
        MHD_RESTORE_WARN_CPP_INIT_LIST_
 #  endif
 MHD_RESTORE_WARN_VARIADIC_MACROS_
author	Evgeny Grin (Karlson2k) <k2k@narod.ru>	2024-04-09 12:10:42 +0200
committer	Evgeny Grin (Karlson2k) <k2k@narod.ru>	2024-04-09 12:10:42 +0200
commit	00c669fca41ba69c41cfc059e3b7033297118a35 (patch)
tree	4249f670a6058acc7cd7f488ad538c2aa9e66c57
parent	d47c202beb12016cbc98979867a503df3088919d (diff)
download	libmicrohttpd-m1.tar.gz libmicrohttpd-m1.zip

diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h index ebdcec3d..beba2301 100644 --- a/src/include/microhttpd2.h +++ b/src/include/microhttpd2.h
@@ -6556,12 +6556,13 @@ MHD_NOWARN_VARIADIC_MACROS_
6556	* @return ::MHD_SC_OK on success,	6556	* @return ::MHD_SC_OK on success,
6557	* error code otherwise	6557	* error code otherwise
6558	*/	6558	*/
6559	# define MHD_DAEMON_OPTIONS_SET(daemon,...) \	6559	# define MHD_DAEMON_OPTIONS_SET(daemon,...) \
6560	MHD_NOWARN_COMPOUND_LITERALS_ \	6560	MHD_NOWARN_COMPOUND_LITERALS_ \
6561	MHD_daemon_options_set (daemon, \	6561	MHD_daemon_options_set ( \
6562	((const struct MHD_DaemonOptionAndValue[]) \	6562	daemon, \
6563	{__VA_ARGS__, MHD_D_OPTION_TERMINATE ()}), \	6563	((const struct MHD_DaemonOptionAndValue[]) \
6564	MHD_OPTIONS_ARRAY_MAX_SIZE) \	6564	{__VA_ARGS__, MHD_D_OPTION_TERMINATE ()}), \
		6565	MHD_OPTIONS_ARRAY_MAX_SIZE) \
6565	MHD_RESTORE_WARN_COMPOUND_LITERALS_	6566	MHD_RESTORE_WARN_COMPOUND_LITERALS_
6566	# elif defined(MHD_USE_CPP_INIT_LIST)	6567	# elif defined(MHD_USE_CPP_INIT_LIST)
6567	MHD_C_DECLRATIONS_FINISH_HERE_	6568	MHD_C_DECLRATIONS_FINISH_HERE_
@@ -6583,13 +6584,13 @@ MHD_C_DECLRATIONS_START_HERE_
6583	* @return ::MHD_SC_OK on success,	6584	* @return ::MHD_SC_OK on success,
6584	* error code otherwise	6585	* error code otherwise
6585	*/	6586	*/
6586	# define MHD_DAEMON_OPTIONS_SET(daemon,...) \	6587	# define MHD_DAEMON_OPTIONS_SET(daemon,...) \
6587	MHD_NOWARN_CPP_INIT_LIST_ \	6588	MHD_NOWARN_CPP_INIT_LIST_ \
6588	MHD_daemon_options_set (daemon, \	6589	MHD_daemon_options_set ( \
6589	(std::vector<struct MHD_DaemonOptionAndValue> \	6590	daemon, \
6590	{__VA_ARGS__,MHD_D_OPTION_TERMINATE ()}).data \	6591	(std::vector<struct MHD_DaemonOptionAndValue> \
6591	(), \	6592	{__VA_ARGS__,MHD_D_OPTION_TERMINATE ()}).data (), \
6592	MHD_OPTIONS_ARRAY_MAX_SIZE) \	6593	MHD_OPTIONS_ARRAY_MAX_SIZE) \
6593	MHD_RESTORE_WARN_CPP_INIT_LIST_	6594	MHD_RESTORE_WARN_CPP_INIT_LIST_
6594	# endif	6595	# endif
6595	MHD_RESTORE_WARN_VARIADIC_MACROS_	6596	MHD_RESTORE_WARN_VARIADIC_MACROS_
@@ -6895,13 +6896,13 @@ MHD_NOWARN_VARIADIC_MACROS_
6895	* @return ::MHD_SC_OK on success,	6896	* @return ::MHD_SC_OK on success,
6896	* error code otherwise	6897	* error code otherwise
6897	*/	6898	*/
6898	# define MHD_CONNECTION_OPTIONS_SET(connection,...) \	6899	# define MHD_CONNECTION_OPTIONS_SET(connection,...) \
6899	MHD_NOWARN_COMPOUND_LITERALS_ \	6900	MHD_NOWARN_COMPOUND_LITERALS_ \
6900	MHD_connection_options_set (daemon, \	6901	MHD_connection_options_set ( \
6901	((const struct MHD_ConnectionOptionAndValue \	6902	daemon, \
6902	[]) \	6903	((const struct MHD_ConnectionOptionAndValue []) \
6903	{__VA_ARGS__, MHD_C_OPTION_TERMINATE ()}), \	6904	{__VA_ARGS__, MHD_C_OPTION_TERMINATE ()}), \
6904	MHD_OPTIONS_ARRAY_MAX_SIZE) \	6905	MHD_OPTIONS_ARRAY_MAX_SIZE) \
6905	MHD_RESTORE_WARN_COMPOUND_LITERALS_	6906	MHD_RESTORE_WARN_COMPOUND_LITERALS_
6906	# elif defined(MHD_USE_CPP_INIT_LIST)	6907	# elif defined(MHD_USE_CPP_INIT_LIST)
6907	MHD_C_DECLRATIONS_FINISH_HERE_	6908	MHD_C_DECLRATIONS_FINISH_HERE_
@@ -6922,14 +6923,13 @@ MHD_C_DECLRATIONS_START_HERE_
6922	* @return ::MHD_SC_OK on success,	6923	* @return ::MHD_SC_OK on success,
6923	* error code otherwise	6924	* error code otherwise
6924	*/	6925	*/
6925	# define MHD_CONNECTION_OPTIONS_SET(daemon,...) \	6926	# define MHD_CONNECTION_OPTIONS_SET(daemon,...) \
6926	MHD_NOWARN_CPP_INIT_LIST_ \	6927	MHD_NOWARN_CPP_INIT_LIST_ \
6927	MHD_daemon_options_set (daemon, \	6928	MHD_daemon_options_set ( \
6928	(std::vector<struct MHD_ConnectionOptionAndValue \	6929	daemon, \
6929	> \	6930	(std::vector<struct MHD_ConnectionOptionAndValue> \
6930	{__VA_ARGS__,MHD_C_OPTION_TERMINATE ()}).data \	6931	{__VA_ARGS__,MHD_C_OPTION_TERMINATE ()}).data (), \
6931	(), \	6932	MHD_OPTIONS_ARRAY_MAX_SIZE) \
6932	MHD_OPTIONS_ARRAY_MAX_SIZE) \
6933	MHD_RESTORE_WARN_CPP_INIT_LIST_	6933	MHD_RESTORE_WARN_CPP_INIT_LIST_
6934	# endif	6934	# endif
6935	MHD_RESTORE_WARN_VARIADIC_MACROS_	6935	MHD_RESTORE_WARN_VARIADIC_MACROS_
@@ -8178,12 +8178,13 @@ MHD_NOWARN_VARIADIC_MACROS_
8178	* @return ::MHD_SC_OK on success,	8178	* @return ::MHD_SC_OK on success,
8179	* error code otherwise	8179	* error code otherwise
8180	*/	8180	*/
8181	# define MHD_RESPONSE_OPTIONS_SET(response,...) \	8181	# define MHD_RESPONSE_OPTIONS_SET(response,...) \
8182	MHD_NOWARN_COMPOUND_LITERALS_ \	8182	MHD_NOWARN_COMPOUND_LITERALS_ \
8183	MHD_response_options_set (response, \	8183	MHD_response_options_set ( \
8184	((const struct MHD_ResponseOptionAndValue[]) \	8184	response, \
8185	{__VA_ARGS__, MHD_R_OPTION_TERMINATE ()}), \	8185	((const struct MHD_ResponseOptionAndValue[]) \
8186	MHD_OPTIONS_ARRAY_MAX_SIZE) \	8186	{__VA_ARGS__, MHD_R_OPTION_TERMINATE ()}), \
		8187	MHD_OPTIONS_ARRAY_MAX_SIZE) \
8187	MHD_RESTORE_WARN_COMPOUND_LITERALS_	8188	MHD_RESTORE_WARN_COMPOUND_LITERALS_
8188	# elif defined(MHD_USE_CPP_INIT_LIST)	8189	# elif defined(MHD_USE_CPP_INIT_LIST)
8189	MHD_C_DECLRATIONS_FINISH_HERE_	8190	MHD_C_DECLRATIONS_FINISH_HERE_
@@ -8205,14 +8206,13 @@ MHD_C_DECLRATIONS_START_HERE_
8205	* @return ::MHD_SC_OK on success,	8206	* @return ::MHD_SC_OK on success,
8206	* error code otherwise	8207	* error code otherwise
8207	*/	8208	*/
8208	# define MHD_RESPONSE_OPTIONS_SET(response,...) \	8209	# define MHD_RESPONSE_OPTIONS_SET(response,...) \
8209	MHD_NOWARN_CPP_INIT_LIST_ \	8210	MHD_NOWARN_CPP_INIT_LIST_ \
8210	MHD_response_options_set (response, \	8211	MHD_response_options_set ( \
8211	(std::vector<struct MHD_ResponseOptionAndValue \	8212	response, \
8212	> \	8213	(std::vector<struct MHD_ResponseOptionAndValue> \
8213	{__VA_ARGS__,MHD_R_OPTION_TERMINATE ()}).data \	8214	{__VA_ARGS__,MHD_R_OPTION_TERMINATE ()}).data (), \
8214	(), \	8215	MHD_OPTIONS_ARRAY_MAX_SIZE) \
8215	MHD_OPTIONS_ARRAY_MAX_SIZE) \
8216	MHD_RESTORE_WARN_CPP_INIT_LIST_	8216	MHD_RESTORE_WARN_CPP_INIT_LIST_
8217	# endif	8217	# endif
8218	MHD_RESTORE_WARN_VARIADIC_MACROS_	8218	MHD_RESTORE_WARN_VARIADIC_MACROS_