chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: if we hit the end of an array container return 0 as EOF indicator when reading it
[elogind.git]
/
src
/
journal
/
journal-gatewayd.c
diff --git
a/src/journal/journal-gatewayd.c
b/src/journal/journal-gatewayd.c
index 133d0ae478cfb32849d32613298df96ec76ca8e9..d4d4b7ef043d17401650b4a5b4759a1e71c78df9 100644
(file)
--- a/
src/journal/journal-gatewayd.c
+++ b/
src/journal/journal-gatewayd.c
@@
-32,8
+32,7
@@
#include "sd-journal.h"
#include "sd-daemon.h"
#include "sd-bus.h"
#include "sd-journal.h"
#include "sd-daemon.h"
#include "sd-bus.h"
-#include "bus-message.h"
-#include "bus-internal.h"
+#include "bus-util.h"
#include "logs-show.h"
#include "microhttpd-util.h"
#include "build.h"
#include "logs-show.h"
#include "microhttpd-util.h"
#include "build.h"
@@
-109,7
+108,7
@@
static int open_journal(RequestMeta *m) {
if (m->journal)
return 0;
if (m->journal)
return 0;
- return sd_journal_open(&m->journal, SD_JOURNAL_LOCAL_ONLY|SD_JOURNAL_SYSTEM
_ONLY
);
+ return sd_journal_open(&m->journal, SD_JOURNAL_LOCAL_ONLY|SD_JOURNAL_SYSTEM);
}
static int respond_oom_internal(struct MHD_Connection *connection) {
}
static int respond_oom_internal(struct MHD_Connection *connection) {
@@
-248,7
+247,7
@@
static ssize_t request_reader_entries(
}
}
}
}
- r = output_journal(m->tmp, m->journal, m->mode, 0, OUTPUT_FULL_WIDTH);
+ r = output_journal(m->tmp, m->journal, m->mode, 0, OUTPUT_FULL_WIDTH
, NULL
);
if (r < 0) {
log_error("Failed to serialize item: %s", strerror(-r));
return MHD_CONTENT_READER_END_WITH_ERROR;
if (r < 0) {
log_error("Failed to serialize item: %s", strerror(-r));
return MHD_CONTENT_READER_END_WITH_ERROR;
@@
-335,7
+334,7
@@
static int request_parse_range(
colon2 = strchr(colon + 1, ':');
if (colon2) {
colon2 = strchr(colon + 1, ':');
if (colon2) {
-
char _cleanup_free_
*t;
+
_cleanup_free_ char
*t;
t = strndup(colon + 1, colon2 - colon - 1);
if (!t)
t = strndup(colon + 1, colon2 - colon - 1);
if (!t)
@@
-743,7
+742,7
@@
static int request_handler_file(
}
static int get_virtualization(char **v) {
}
static int get_virtualization(char **v) {
- _cleanup_bus_message_unref_ sd_bus_message *
m = NULL, *
reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_unref_ sd_bus *bus = NULL;
const char *t;
char *b;
_cleanup_bus_unref_ sd_bus *bus = NULL;
const char *t;
char *b;
@@
-753,21
+752,17
@@
static int get_virtualization(char **v) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_
message_new_method_call
(
+ r = sd_bus_
call_method
(
bus,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.DBus.Properties",
"Get",
bus,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.DBus.Properties",
"Get",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "ss", "org.freedesktop.systemd1.Manager", "Virtualization");
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
+ NULL,
+ &reply,
+ "ss",
+ "org.freedesktop.systemd1.Manager",
+ "Virtualization");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-838,17
+833,17
@@
static int request_handler_machine(
"\"hostname\" : \"%s\","
"\"os_pretty_name\" : \"%s\","
"\"virtualization\" : \"%s\","
"\"hostname\" : \"%s\","
"\"os_pretty_name\" : \"%s\","
"\"virtualization\" : \"%s\","
- "\"usage\" : \"%
llu
\","
- "\"cutoff_from_realtime\" : \"%
llu
\","
- "\"cutoff_to_realtime\" : \"%
llu
\" }\n",
+ "\"usage\" : \"%
"PRIu64"
\","
+ "\"cutoff_from_realtime\" : \"%
"PRIu64"
\","
+ "\"cutoff_to_realtime\" : \"%
"PRIu64"
\" }\n",
SD_ID128_FORMAT_VAL(mid),
SD_ID128_FORMAT_VAL(bid),
SD_ID128_FORMAT_VAL(mid),
SD_ID128_FORMAT_VAL(bid),
- hostname_cleanup(hostname),
+ hostname_cleanup(hostname
, false
),
os_name ? os_name : "Linux",
v ? v : "bare",
os_name ? os_name : "Linux",
v ? v : "bare",
-
(unsigned long long)
usage,
-
(unsigned long long)
cutoff_from,
-
(unsigned long long)
cutoff_to);
+ usage,
+ cutoff_from,
+ cutoff_to);
if (r < 0)
return respond_oom(connection);
if (r < 0)
return respond_oom(connection);