shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-25 06:03:40 +03:00
Code

journal-remote: fix warning about deprecated µhttpd macro

Browse Source 
src/journal-remote/journal-remote.c:590:13: warning: Value MHD_HTTP_METHOD_NOT_ACCEPTABLE is deprecated, use MHD_HTTP_NOT_ACCEPTABLE
                 return mhd_respond(connection, MHD_HTTP_METHOD_NOT_ACCEPTABLE,
             ^

The new define was added in 0.9.38. Instead of requiring the new
libmicrohttpd version, provide the fallback, it is trivial.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-01-15 14:13:12 -05:00
parent 555f5cdc2d
commit ce7229a224
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/journal-remote/journal-gatewayd.c
View File

@ -840,7 +840,7 @@ static int request_handler(
assert(method);
if (!streq(method, "GET"))
return mhd_respond(connection, MHD_HTTP_METHOD_NOT_ACCEPTABLE,
return mhd_respond(connection, MHD_HTTP_NOT_ACCEPTABLE,
"Unsupported method.\n");

2
src/journal-remote/journal-remote.c
View File

@ -587,7 +587,7 @@ static int request_handler(
*connection_cls);
if (!streq(method, "POST"))
return mhd_respond(connection, MHD_HTTP_METHOD_NOT_ACCEPTABLE,
return mhd_respond(connection, MHD_HTTP_NOT_ACCEPTABLE,
"Unsupported method.\n");
if (!streq(url, "/upload"))

5
src/journal-remote/microhttpd-util.h
View File

@ -26,6 +26,11 @@
#include "macro.h"
/* Compatiblity with libmicrohttpd < 0.9.38 */
#ifndef MHD_HTTP_NOT_ACCEPTABLE
#define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE
#endif
void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
/* respond_oom() must be usable with return, hence this form. */