SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal-gatewayd: unify two code paths

Browse Source 
In preparation for adding more options, split out the option
handling code.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2013-01-18 01:15:54 -05:00
parent a6c4586586
commit c54ff8e358
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journal-gatewayd.c
+11 -11
View File
@@ -879,22 +879,22 @@ int main(int argc, char *argv[]) {
} else if (n > 1) {
log_error("Can't listen on more than one socket.");
goto finish;
} else if (n > 0) {
} else {
struct MHD_OptionItem opts[] = {
{ MHD_OPTION_NOTIFY_COMPLETED,
(intptr_t) request_meta_free, NULL },
{ MHD_OPTION_END, 0, NULL },
{ MHD_OPTION_END, 0, NULL }};
if (n > 0)
opts[1] = (struct MHD_OptionItem)
{MHD_OPTION_LISTEN_SOCKET, SD_LISTEN_FDS_START, NULL};
d = MHD_start_daemon(
MHD_USE_THREAD_PER_CONNECTION|MHD_USE_POLL|MHD_USE_DEBUG,
19531,
NULL, NULL,
request_handler, NULL,
MHD_OPTION_LISTEN_SOCKET, SD_LISTEN_FDS_START,
MHD_OPTION_NOTIFY_COMPLETED, request_meta_free, NULL,
MHD_OPTION_END);
} else {
d = MHD_start_daemon(
MHD_USE_DEBUG|MHD_USE_THREAD_PER_CONNECTION|MHD_USE_POLL,
19531,
NULL, NULL,
request_handler, NULL,
MHD_OPTION_NOTIFY_COMPLETED, request_meta_free, NULL,
MHD_OPTION_ARRAY, opts,
MHD_OPTION_END);
}