X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibelogind%2Fsd-bus%2Fbus-introspect.c;h=d4b9878b17ab50cd4b1fa7b2d6b539347e671b95;hb=ec82d020534270d1979da2d0b27f84e1846b2851;hp=24aa21dfd3a4c2550820ec36679ed3b22fdc876f;hpb=58764450160b12913bd66fe89901f0a37dec2774;p=elogind.git
diff --git a/src/libelogind/sd-bus/bus-introspect.c b/src/libelogind/sd-bus/bus-introspect.c
index 24aa21dfd..d4b9878b1 100644
--- a/src/libelogind/sd-bus/bus-introspect.c
+++ b/src/libelogind/sd-bus/bus-introspect.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,11 +17,14 @@
along with systemd; If not, see .
***/
-#include "util.h"
-#include "bus-introspect.h"
-#include "bus-signature.h"
#include "bus-internal.h"
+#include "bus-introspect.h"
#include "bus-protocol.h"
+#include "bus-signature.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "string-util.h"
+#include "util.h"
int introspect_begin(struct introspect *i, bool trusted) {
assert(i);
@@ -82,7 +83,7 @@ static void introspect_write_flags(struct introspect *i, int type, int flags) {
if (type == _SD_BUS_VTABLE_PROPERTY || type == _SD_BUS_VTABLE_WRITABLE_PROPERTY) {
if (flags & SD_BUS_VTABLE_PROPERTY_EXPLICIT)
- fputs(" \n", i->f);
+ fputs(" \n", i->f);
if (flags & SD_BUS_VTABLE_PROPERTY_CONST)
fputs(" \n", i->f);
@@ -95,7 +96,7 @@ static void introspect_write_flags(struct introspect *i, int type, int flags) {
if (!i->trusted &&
(type == _SD_BUS_VTABLE_METHOD || type == _SD_BUS_VTABLE_WRITABLE_PROPERTY) &&
!(flags & SD_BUS_VTABLE_UNPRIVILEGED))
- fputs(" \n", i->f);
+ fputs(" \n", i->f);
}
static int introspect_write_arguments(struct introspect *i, const char *signature, const char *direction) {
@@ -204,9 +205,8 @@ int introspect_finish(struct introspect *i, sd_bus *bus, sd_bus_message *m, sd_b
void introspect_free(struct introspect *i) {
assert(i);
- if (i->f)
- fclose(i->f);
+ safe_fclose(i->f);
- free(i->introspection);
+ free(i->introspection);
zero(*i);
}