treewide: yet more log_*_errno + return simplifications

Using:
find . -name '*.[ch]' | while read f; do perl -i.mmm -e \
 'local $/;
  local $_=<>;
  s/(if\s*\([^\n]+\))\s*{\n(\s*)(log_[a-z_]*_errno\(\s*([->a-zA-Z_]+)\s*,[^;]+);\s*return\s+\g4;\s+}/\1\n\2return \3;/msg;
  print;'
 $f
done

And a couple of manual whitespace fixups.
This commit is contained in:
Michal Schmidt
2014-11-28 18:56:16 +01:00
parent e80733be33
commit f647962d64
44 changed files with 476 additions and 947 deletions
+2 -4
View File
@@ -53,10 +53,8 @@ static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu
log_info("Invoked Foobar() on %s", sd_bus_message_get_path(m));
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
log_error_errno(r, "Failed to send reply: %m");
return r;
}
if (r < 0)
return log_error_errno(r, "Failed to send reply: %m");
return 1;
}
+2 -4
View File
@@ -146,10 +146,8 @@ static int client(struct context *c) {
"/",
"org.freedesktop.systemd.test",
"Exit");
if (r < 0) {
log_error_errno(r, "Failed to allocate method call: %m");
return r;
}
if (r < 0)
return log_error_errno(r, "Failed to allocate method call: %m");
r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0) {