commit 16f6bf31f969b69081407deb5905ad2ae4e20a83
parent 2e12b00b20c4b2c067cd9ec612baae173f612836
Author: Christian Grothoff <christian@grothoff.org>
Date: Fri, 9 May 2025 15:05:01 +0200
fix ftbfs
Diffstat:
2 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/src/test/test_twister_webserver.c b/src/test/test_twister_webserver.c
@@ -39,44 +39,45 @@
static enum MHD_Result
answer_to_connection
(void *cls, struct MHD_Connection *connection,
- const char *url, const char *method,
- const char *version, const char *upload_data,
- size_t *upload_data_size, void **con_cls)
+ const char *url, const char *method,
+ const char *version, const char *upload_data,
+ size_t *upload_data_size, void **con_cls)
{
#if 0
const char *page = "<html><body>Hello, browser!</body></html>";
#endif
- const char *page = "{\"hello\": [{\"this\": \"browser!\"}],"\
+ const char *page = "{\"hello\": [{\"this\": \"browser!\"}]," \
"\"when\": \"today\"}";
struct MHD_Response *response;
int ret;
- (void)cls; /* Unused. Silent compiler warning. */
- (void)url; /* Unused. Silent compiler warning. */
- (void)method; /* Unused. Silent compiler warning. */
- (void)version; /* Unused. Silent compiler warning. */
- (void)upload_data; /* Unused. Silent compiler warning. */
+ (void) cls; /* Unused. Silent compiler warning. */
+ (void) url; /* Unused. Silent compiler warning. */
+ (void) method; /* Unused. Silent compiler warning. */
+ (void) version; /* Unused. Silent compiler warning. */
+ (void) upload_data; /* Unused. Silent compiler warning. */
if (NULL == (*con_cls))
- {
- *con_cls = "first";
- return MHD_YES;
- }
+ {
+ *con_cls = (void *) "first";
+ return MHD_YES;
+ }
if (0 != *upload_data_size)
- {
- *upload_data_size = 0;
- return MHD_YES;
- }
+ {
+ *upload_data_size = 0;
+ return MHD_YES;
+ }
response = MHD_create_response_from_buffer
- (strlen (page),
- (void *) page,
- MHD_RESPMEM_PERSISTENT);
+ (strlen (page),
+ (void *) page,
+ MHD_RESPMEM_PERSISTENT);
ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
MHD_destroy_response (response);
return ret;
}
+
/**
* This minimalist Web server listens on port PORT and responds
* with a HTTP status 200 OK and some static "hello world" body,
diff --git a/src/twister/taler-twister-service.c b/src/twister/taler-twister-service.c
@@ -33,6 +33,7 @@
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_json_lib.h>
#include <gnunet/gnunet_mhd_compat.h>
+#include <gnunet/gnunet_mhd_lib.h>
#include "twister.h"
#include "taler_twister_service.h"
#include <jansson.h>
@@ -1333,10 +1334,10 @@ inflate_data (struct HttpRequest *request)
{
case Z_MEM_ERROR:
GNUNET_break (0);
- return GNUNET_JSON_PR_OUT_OF_MEMORY;
+ return GNUNET_MHD_PR_OUT_OF_MEMORY;
case Z_STREAM_ERROR:
GNUNET_break_op (0);
- return GNUNET_JSON_PR_JSON_INVALID;
+ return GNUNET_MHD_PR_JSON_INVALID;
case Z_OK:
break;
}
@@ -1349,17 +1350,17 @@ inflate_data (struct HttpRequest *request)
GNUNET_break (0);
GNUNET_break (Z_OK == inflateEnd (&z));
GNUNET_free (tmp);
- return GNUNET_JSON_PR_OUT_OF_MEMORY;
+ return GNUNET_MHD_PR_OUT_OF_MEMORY;
case Z_DATA_ERROR:
GNUNET_break (0);
GNUNET_break (Z_OK == inflateEnd (&z));
GNUNET_free (tmp);
- return GNUNET_JSON_PR_JSON_INVALID;
+ return GNUNET_MHD_PR_JSON_INVALID;
case Z_NEED_DICT:
GNUNET_break (0);
GNUNET_break (Z_OK == inflateEnd (&z));
GNUNET_free (tmp);
- return GNUNET_JSON_PR_JSON_INVALID;
+ return GNUNET_MHD_PR_JSON_INVALID;
case Z_OK:
if ((0 < z.avail_out) && (0 == z.avail_in))
{
@@ -1367,7 +1368,7 @@ inflate_data (struct HttpRequest *request)
GNUNET_break (0);
GNUNET_break (Z_OK == inflateEnd (&z));
GNUNET_free (tmp);
- return GNUNET_JSON_PR_JSON_INVALID;
+ return GNUNET_MHD_PR_JSON_INVALID;
}
if (0 < z.avail_out)
continue; /* just call it again */
@@ -1378,7 +1379,7 @@ inflate_data (struct HttpRequest *request)
GNUNET_break (0);
GNUNET_break (Z_OK == inflateEnd (&z));
GNUNET_free (tmp);
- return GNUNET_JSON_PR_OUT_OF_MEMORY;
+ return GNUNET_MHD_PR_OUT_OF_MEMORY;
}
if (tmp_size * 2 < tmp_size)
tmp_size = REQUEST_BUFFER_MAX;
@@ -1394,7 +1395,7 @@ inflate_data (struct HttpRequest *request)
request->io_size = tmp_size;
request->io_len = z.total_out;
GNUNET_break (Z_OK == inflateEnd (&z));
- return GNUNET_JSON_PR_SUCCESS; /* at least for now */
+ return GNUNET_MHD_PR_SUCCESS; /* at least for now */
}
} /* while (1) */
}
