chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: more log_*_errno + return simplifications
[elogind.git]
/
src
/
dbus1-generator
/
dbus1-generator.c
diff --git
a/src/dbus1-generator/dbus1-generator.c
b/src/dbus1-generator/dbus1-generator.c
index 5d3b1a856afa8281b1066d427b7348c1f9e46ab6..21e9e9ca73daf0abbb8d5a6b1370853b3df2200a 100644
(file)
--- a/
src/dbus1-generator/dbus1-generator.c
+++ b/
src/dbus1-generator/dbus1-generator.c
@@
-102,10
+102,8
@@
static int create_dbus_files(
}
r = fflush_and_check(f);
}
r = fflush_and_check(f);
- if (r < 0) {
- log_error_errno(r, "Failed to write %s: %m", a);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write %s: %m", a);
fclose(f);
f = NULL;
fclose(f);
f = NULL;
@@
-139,10
+137,8
@@
static int create_dbus_files(
service);
r = fflush_and_check(f);
service);
r = fflush_and_check(f);
- if (r < 0) {
- log_error_errno(r, "Failed to write %s: %m", b);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write %s: %m", b);
lnk = strjoin(arg_dest_late, "/" SPECIAL_BUSNAMES_TARGET ".wants/", name, ".busname", NULL);
if (!lnk)
lnk = strjoin(arg_dest_late, "/" SPECIAL_BUSNAMES_TARGET ".wants/", name, ".busname", NULL);
if (!lnk)
@@
-331,10
+327,8
@@
int main(int argc, char *argv[]) {
path = "/usr/share/dbus-1/system-services";
type = "system";
units = SYSTEM_DATA_UNIT_PATH;
path = "/usr/share/dbus-1/system-services";
type = "system";
units = SYSTEM_DATA_UNIT_PATH;
- } else {
- log_error_errno(r, "Failed to determine whether we are running as user or system instance: %m");
- return r;
- }
+ } else
+ return log_error_errno(r, "Failed to determine whether we are running as user or system instance: %m");
r = parse_dbus_fragments(path, type);
r = parse_dbus_fragments(path, type);