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: be nice to LLVM and don't embedd a VLA in a union
[elogind.git]
/
src
/
libsystemd-bus
/
bus-introspect.c
diff --git
a/src/libsystemd-bus/bus-introspect.c
b/src/libsystemd-bus/bus-introspect.c
index 31788782edee19888cf0c8b01f20237f2db0cf1c..1965364cd0ae26a62350922c532724c2ed7fe433 100644
(file)
--- a/
src/libsystemd-bus/bus-introspect.c
+++ b/
src/libsystemd-bus/bus-introspect.c
@@
-63,7
+63,7
@@
int introspect_write_child_nodes(struct introspect *i, Set *s, const char *prefi
const char *e;
e = object_path_startswith(node, prefix);
const char *e;
e = object_path_startswith(node, prefix);
- if (e)
+ if (e
&& e[0]
)
fprintf(i->f, " <node name=\"%s\"/>\n", e);
free(node);
fprintf(i->f, " <node name=\"%s\"/>\n", e);
free(node);
@@
-103,21
+103,18
@@
static int introspect_write_arguments(struct introspect *i, const char *signatur
fprintf(i->f, " <arg type=\"%.*s\"", (int) l, signature);
if (direction)
fprintf(i->f, " <arg type=\"%.*s\"", (int) l, signature);
if (direction)
- fprintf(i->f, " direction=\"%s\">\n", direction);
+ fprintf(i->f, " direction=\"%s\"
/
>\n", direction);
else
else
- fputs(">\n", i->f);
+ fputs("
/
>\n", i->f);
signature += l;
}
}
signature += l;
}
}
-int introspect_write_interface(struct introspect *i, const
char *interface, const
sd_bus_vtable *v) {
+int introspect_write_interface(struct introspect *i, const sd_bus_vtable *v) {
assert(i);
assert(i);
- assert(interface);
assert(v);
assert(v);
- fprintf(i->f, " <interface name=\"%s\">\n", interface);
-
for (; v->type != _SD_BUS_VTABLE_END; v++) {
switch (v->type) {
for (; v->type != _SD_BUS_VTABLE_END; v++) {
switch (v->type) {
@@
-155,7
+152,6
@@
int introspect_write_interface(struct introspect *i, const char *interface, cons
}
}
- fputs(" </interface>\n", i->f);
return 0;
}
return 0;
}
@@
-173,7
+169,7
@@
int introspect_finish(struct introspect *i, sd_bus *bus, sd_bus_message *m, sd_b
if (ferror(i->f))
return -ENOMEM;
if (ferror(i->f))
return -ENOMEM;
- r = sd_bus_message_new_method_return(
bus,
m, &q);
+ r = sd_bus_message_new_method_return(m, &q);
if (r < 0)
return r;
if (r < 0)
return r;