chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix service file to match installed elogind binary location
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-introspect.c
diff --git
a/src/libelogind/sd-bus/bus-introspect.c
b/src/libelogind/sd-bus/bus-introspect.c
index fe7fcb5c51cebc17f573fbbeef17a26bc64bfe73..d4b9878b17ab50cd4b1fa7b2d6b539347e671b95 100644
(file)
--- 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.
/***
This file is part of systemd.
@@
-19,11
+17,14
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "util.h"
-#include "bus-introspect.h"
-#include "bus-signature.h"
#include "bus-internal.h"
#include "bus-internal.h"
+#include "bus-introspect.h"
#include "bus-protocol.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);
int introspect_begin(struct introspect *i, bool trusted) {
assert(i);
@@
-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);
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);
}
zero(*i);
}