From 94c156cd452424ea59931920df2454d9da7cb774 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 9 Sep 2015 11:08:23 +0200 Subject: tree-wide: make use of log_error_errno() return value in more cases The previous coccinelle semantic patch that improved usage of log_error_errno()'s return value, only looked for log_error_errno() invocations with a single parameter after the error parameter. Update the patch to handle arbitrary numbers of additional arguments. --- src/core/namespace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core') diff --git a/src/core/namespace.c b/src/core/namespace.c index 0b85b859fa..5ff35b38fb 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -294,15 +294,15 @@ static int mount_kdbus(BindMount *m) { busnode = strjoina(root, "/bus"); if (mknod(busnode, (st.st_mode & ~07777) | 0600, st.st_rdev) < 0) { - log_error_errno(errno, "mknod() for %s failed: %m", busnode); - r = -errno; + r = log_error_errno(errno, "mknod() for %s failed: %m", + busnode); goto fail; } r = mount(m->path, busnode, NULL, MS_BIND, NULL); if (r < 0) { - log_error_errno(errno, "bind mount of %s failed: %m", m->path); - r = -errno; + r = log_error_errno(errno, "bind mount of %s failed: %m", + m->path); goto fail; } @@ -313,8 +313,8 @@ static int mount_kdbus(BindMount *m) { } if (mount(root, basepath, NULL, MS_MOVE, NULL) < 0) { - log_error_errno(errno, "bind mount of %s failed: %m", basepath); - r = -errno; + r = log_error_errno(errno, "bind mount of %s failed: %m", + basepath); goto fail; } -- cgit v1.2.3-54-g00ecf From 1f6b411372076426c0faf0bb350437fb4d82931f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 9 Sep 2015 14:23:02 +0200 Subject: tree-wide: update empty-if coccinelle script to cover empty-while and more Let's also clean up single-line while and for blocks. --- coccinelle/empty-if.cocci | 47 ++++++++++++++++++++++++++--- src/boot/efi/graphics.c | 3 +- src/bootchart/bootchart.c | 3 +- src/core/execute.c | 3 +- src/core/main.c | 3 +- src/core/namespace.c | 3 +- src/core/service.c | 7 ++--- src/debug-generator/debug-generator.c | 6 ++-- src/hostname/hostnamed.c | 3 +- src/journal-remote/journal-remote.c | 3 +- src/journal/journald-native.c | 2 ++ src/libsystemd/sd-netlink/netlink-message.c | 3 +- src/shared/pty.c | 6 ++-- src/test/test-ratelimit.c | 9 ++---- src/udev/cdrom_id/cdrom_id.c | 3 +- src/udev/scsi_id/scsi_id.c | 13 +++----- src/udev/scsi_id/scsi_serial.c | 6 ++-- src/udev/udev-builtin-keyboard.c | 3 +- src/udev/udev-rules.c | 8 ++--- src/udev/udev-watch.c | 5 ++- 20 files changed, 76 insertions(+), 63 deletions(-) (limited to 'src/core') diff --git a/coccinelle/empty-if.cocci b/coccinelle/empty-if.cocci index ebd0bfddce..026c461ee6 100644 --- a/coccinelle/empty-if.cocci +++ b/coccinelle/empty-if.cocci @@ -1,19 +1,56 @@ @@ -expression e, f; +expression e, f, g, h, i, j; statement s, t; @@ ( if (e) { -if (f) s +( +if (h) s +| +if (h) s else t +| +while (h) s +| +for (h; i; j) s +) } | -if (e) { -if (f) s -else t +while (e) { +( +if (h) s +| +if (h) s else t +| +while (h) s +| +for (h; i; j) s +) +} +| +for (e; f; g) { +( +if (h) s +| +if (h) s else t +| +while (h) s +| +for (h; i; j) s +) } | - if (e) { + if (e) s - } +| +- while (e) { ++ while (e) +s +- } +| +- for (e; f; g) { ++ for (e; f; g) +s +- } ) diff --git a/src/boot/efi/graphics.c b/src/boot/efi/graphics.c index 2e9c11f5a0..f732428216 100644 --- a/src/boot/efi/graphics.c +++ b/src/boot/efi/graphics.c @@ -67,10 +67,9 @@ EFI_STATUS graphics_mode(BOOLEAN on) { EFI_STATUS err; err = LibLocateProtocol(&ConsoleControlProtocolGuid, (VOID **)&ConsoleControl); - if (EFI_ERROR(err)) { + if (EFI_ERROR(err)) /* console control protocol is nonstandard and might not exist. */ return err == EFI_NOT_FOUND ? EFI_SUCCESS : err; - } /* check current mode */ err = uefi_call_wrapper(ConsoleControl->GetMode, 4, ConsoleControl, ¤t, &uga_exists, &stdin_locked); diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index e61b58b5e5..b4047b0d14 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -338,10 +338,9 @@ int main(int argc, char *argv[]) { * - child logs data */ if (getpid() == 1) { - if (fork()) { + if (fork()) /* parent */ execl(arg_init_path, arg_init_path, NULL); - } } argv[0][0] = '@'; diff --git a/src/core/execute.c b/src/core/execute.c index cd3592b847..6abb0a5d5d 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1998,9 +1998,8 @@ void exec_context_done(ExecContext *c) { strv_free(c->environment_files); c->environment_files = NULL; - for (l = 0; l < ELEMENTSOF(c->rlimit); l++) { + for (l = 0; l < ELEMENTSOF(c->rlimit); l++) c->rlimit[l] = mfree(c->rlimit[l]); - } c->working_directory = mfree(c->working_directory); c->root_directory = mfree(c->root_directory); diff --git a/src/core/main.c b/src/core/main.c index 9aaf244e71..8cf1bebc67 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1841,9 +1841,8 @@ finish: arg_shutdown_watchdog = m->shutdown_watchdog; m = manager_free(m); - for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) { + for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) arg_default_rlimit[j] = mfree(arg_default_rlimit[j]); - } arg_default_unit = mfree(arg_default_unit); diff --git a/src/core/namespace.c b/src/core/namespace.c index 5ff35b38fb..eb88574f8f 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -555,10 +555,9 @@ int setup_namespace( /* Remount / as the desired mode. Not that this will not * reestablish propagation from our side to the host, since * what's disconnected is disconnected. */ - if (mount(NULL, "/", NULL, mount_flags | MS_REC, NULL) < 0) { + if (mount(NULL, "/", NULL, mount_flags | MS_REC, NULL) < 0) /* at this point, we cannot rollback */ return -errno; - } return 0; diff --git a/src/core/service.c b/src/core/service.c index e396dbe213..248a9e8c62 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -2937,14 +2937,11 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags, FDSet *fds) } /* Interpret WATCHDOG= */ - if (strv_find(tags, "WATCHDOG=1")) { + if (strv_find(tags, "WATCHDOG=1")) service_reset_watchdog(s); - } - /* Add the passed fds to the fd store */ - if (strv_find(tags, "FDSTORE=1")) { + if (strv_find(tags, "FDSTORE=1")) service_add_fd_store_set(s, fds); - } /* Notify clients about changed status or main pid */ if (notify_dbus) diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c index 3ae9634414..8b29e8fd09 100644 --- a/src/debug-generator/debug-generator.c +++ b/src/debug-generator/debug-generator.c @@ -95,11 +95,10 @@ static int generate_mask_symlinks(void) { if (!p) return log_oom(); - if (symlink("/dev/null", p) < 0) { + if (symlink("/dev/null", p) < 0) r = log_error_errno(errno, "Failed to create mask symlink %s: %m", p); - } } return r; @@ -125,11 +124,10 @@ static int generate_wants_symlinks(void) { mkdir_parents_label(p, 0755); - if (symlink(f, p) < 0) { + if (symlink(f, p) < 0) r = log_error_errno(errno, "Failed to create wants symlink %s: %m", p); - } } return r; diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index cb837e9d03..96cc8951e6 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -63,9 +63,8 @@ static void context_reset(Context *c) { assert(c); - for (p = 0; p < _PROP_MAX; p++) { + for (p = 0; p < _PROP_MAX; p++) c->data[p] = mfree(c->data[p]); - } } static void context_free(Context *c) { diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index bdf01f582c..efa4baafde 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -614,10 +614,9 @@ static int request_handler( return code; } else { r = getnameinfo_pretty(fd, &hostname); - if (r < 0) { + if (r < 0) return mhd_respond(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, "Cannot check remote hostname"); - } } assert(hostname); diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index da3faef93e..3e8a7a05f6 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -184,6 +184,7 @@ void server_process_native_message( free(identifier); identifier = t; } + } else if (l >= 8 && startswith(p, "MESSAGE=")) { char *t; @@ -193,6 +194,7 @@ void server_process_native_message( free(message); message = t; } + } else if (l > strlen("OBJECT_PID=") && l < strlen("OBJECT_PID=") + DECIMAL_STR_MAX(pid_t) && startswith(p, "OBJECT_PID=") && diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c index 7ac8949830..0d8e37b856 100644 --- a/src/libsystemd/sd-netlink/netlink-message.c +++ b/src/libsystemd/sd-netlink/netlink-message.c @@ -892,9 +892,8 @@ int sd_netlink_message_rewind(sd_netlink_message *m) { if (!m->sealed) rtnl_message_seal(m); - for (i = 1; i <= m->n_containers; i++) { + for (i = 1; i <= m->n_containers; i++) m->containers[i].attributes = mfree(m->containers[i].attributes); - } m->n_containers = 0; diff --git a/src/shared/pty.c b/src/shared/pty.c index a87b3ce6f0..35d9ff5f4d 100644 --- a/src/shared/pty.c +++ b/src/shared/pty.c @@ -311,9 +311,8 @@ static int pty_dispatch_read(Pty *pty) { continue; return (errno == EAGAIN) ? 0 : -errno; - } else if (len == 0) { + } else if (len == 0) continue; - } /* set terminating zero for debugging safety */ pty->in_buf[len] = 0; @@ -356,9 +355,8 @@ static int pty_dispatch_write(Pty *pty) { continue; return (errno == EAGAIN) ? 1 : -errno; - } else if (len == 0) { + } else if (len == 0) continue; - } ring_pull(&pty->out_buf, (size_t)len); } diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c index b7f6dfe246..462b55cdb3 100644 --- a/src/test/test-ratelimit.c +++ b/src/test/test-ratelimit.c @@ -27,19 +27,16 @@ static void test_ratelimit_test(void) { int i; RATELIMIT_DEFINE(ratelimit, 1 * USEC_PER_SEC, 10); - for (i = 0; i < 10; i++) { + for (i = 0; i < 10; i++) assert_se(ratelimit_test(&ratelimit)); - } assert_se(!ratelimit_test(&ratelimit)); sleep(1); - for (i = 0; i < 10; i++) { + for (i = 0; i < 10; i++) assert_se(ratelimit_test(&ratelimit)); - } RATELIMIT_INIT(ratelimit, 0, 10); - for (i = 0; i < 10000; i++) { + for (i = 0; i < 10000; i++) assert_se(ratelimit_test(&ratelimit)); - } } int main(int argc, char *argv[]) { diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index 775da0355d..e6a9e354ff 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -565,9 +565,8 @@ static int cd_profiles(struct udev *udev, int fd) if (len > sizeof(features)) { log_debug("can not get features in a single query, truncating"); len = sizeof(features); - } else if (len <= 8) { + } else if (len <= 8) len = sizeof(features); - } /* Now get the full feature buffer */ scsi_cmd_init(udev, &sc); diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index a1b8e75fac..3c4653fd19 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -279,9 +279,9 @@ static int get_file_options(struct udev *udev, strcpy(buffer, options_in); c = argc_count(buffer) + 2; *newargv = calloc(c, sizeof(**newargv)); - if (!*newargv) { + if (!*newargv) retval = log_oom(); - } else { + else { *argc = c; c = 0; /* @@ -537,16 +537,13 @@ static int scsi_id(struct udev *udev, char *maj_min_dev) if (dev_scsi.wwn_vendor_extension[0] != '\0') { printf("ID_WWN_VENDOR_EXTENSION=0x%s\n", dev_scsi.wwn_vendor_extension); printf("ID_WWN_WITH_EXTENSION=0x%s%s\n", dev_scsi.wwn, dev_scsi.wwn_vendor_extension); - } else { + } else printf("ID_WWN_WITH_EXTENSION=0x%s\n", dev_scsi.wwn); - } } - if (dev_scsi.tgpt_group[0] != '\0') { + if (dev_scsi.tgpt_group[0] != '\0') printf("ID_TARGET_PORT=%s\n", dev_scsi.tgpt_group); - } - if (dev_scsi.unit_serial_number[0] != '\0') { + if (dev_scsi.unit_serial_number[0] != '\0') printf("ID_SCSI_SERIAL=%s\n", dev_scsi.unit_serial_number); - } goto out; } diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c index 69260cb1a0..de3b4f7581 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/udev/scsi_id/scsi_serial.c @@ -135,9 +135,8 @@ static int sg_err_category_new(struct udev *udev, return SG_ERR_CAT_MEDIA_CHANGED; if (0x29 == asc) return SG_ERR_CAT_RESET; - } else if (sense_key == ILLEGAL_REQUEST) { + } else if (sense_key == ILLEGAL_REQUEST) return SG_ERR_CAT_NOTSUPPORTED; - } } return SG_ERR_CAT_SENSE; } @@ -490,9 +489,8 @@ static int check_fill_0x83_id(struct udev *udev, if ((page_83[1] & 0x30) == 0x10) { if (id_search->id_type != SCSI_ID_TGTGROUP) return 1; - } else if ((page_83[1] & 0x30) != 0) { + } else if ((page_83[1] & 0x30) != 0) return 1; - } if ((page_83[1] & 0x0f) != id_search->id_type) return 1; diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c index 01f3879f37..d63a8e2760 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/udev/udev-builtin-keyboard.c @@ -255,9 +255,8 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo } override_abs(fd, node, evcode, udev_list_entry_get_value(entry)); - } else if (streq(key, "POINTINGSTICK_SENSITIVITY")) { + } else if (streq(key, "POINTINGSTICK_SENSITIVITY")) set_trackpoint_sensitivity(dev, udev_list_entry_get_value(entry)); - } } /* install list of force-release codes */ diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 822f292217..98c33171d4 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1428,9 +1428,9 @@ static int add_rule(struct udev_rules *rules, char *line, } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) { uid = add_uid(rules, value); rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid); - } else if (rules->resolve_names >= 0) { + } else if (rules->resolve_names >= 0) rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL); - } + rule_tmp.rule.rule.can_set_name = true; continue; } @@ -1450,9 +1450,9 @@ static int add_rule(struct udev_rules *rules, char *line, } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) { gid = add_gid(rules, value); rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid); - } else if (rules->resolve_names >= 0) { + } else if (rules->resolve_names >= 0) rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL); - } + rule_tmp.rule.rule.can_set_name = true; continue; } diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 15b76dd6ab..9aa5ab185d 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -83,9 +83,8 @@ unlink: closedir(dir); rmdir("/run/udev/watch.old"); - } else if (errno != ENOENT) { + } else if (errno != ENOENT) log_error_errno(errno, "unable to move watches dir /run/udev/watch; old watches will not be restored: %m"); - } } void udev_watch_begin(struct udev *udev, struct udev_device *dev) { @@ -100,7 +99,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev) { wd = inotify_add_watch(inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE); if (wd < 0) { log_error_errno(errno, "inotify_add_watch(%d, %s, %o) failed: %m", - inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE); + inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE); return; } -- cgit v1.2.3-54-g00ecf