picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: drop {} from one-line if blocks 

Patch via coccinelle.
This commit is contained in:
Lennart Poettering 2015-09-08 23:03:38 +02:00
parent 76ef789d26
commit ece174c543
35 changed files with 56 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
coccinelle/empty-if.cocci Normal file
View File

@ -0,0 +1,19 @@
@@
expression e, f;
statement s, t;
@@
(
if (e) {
if (f) s
}
|
if (e) {
if (f) s
else t
}
|
- if (e) {
+ if (e)
s
- }
)

5
src/analyze/analyze.c
View File

@ -844,11 +844,8 @@ static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int lev
STRV_FOREACH(c, deps) {
times = hashmap_get(unit_times_hashmap, *c);
if (times && times->activated
&& times->activated <= boot->finish_time
&& (service_longest - times->activated) <= arg_fuzz) {
if (times && times->activated && times->activated <= boot->finish_time && (service_longest - times->activated) <= arg_fuzz)
to_print++;
}
}
if (!to_print)

6
src/basic/strv.c
View File

@ -270,9 +270,8 @@ char **strv_split_newlines(const char *s) {
if (n <= 0)
return l;
if (isempty(l[n-1])) {
if (isempty(l[n - 1]))
l[n - 1] = mfree(l[n - 1]);
}
return l;
}
@ -291,9 +290,8 @@ int strv_split_extract(char ***t, const char *s, const char *separators, Extract
r = extract_first_word(&s, &word, separators, flags);
if (r < 0)
return r;
if (r == 0) {
if (r == 0)
break;
}
if (!GREEDY_REALLOC(l, allocated, n + 2))
return -ENOMEM;

3
src/bootchart/bootchart.c
View File

@ -438,10 +438,9 @@ int main(int argc, char *argv[]) {
res = nanosleep(&req, NULL);
if (res) {
if (errno == EINTR) {
if (errno == EINTR)
/* caught signal, probably HUP! */
break;
}
log_error_errno(errno, "nanosleep() failed: %m");
return EXIT_FAILURE;
}

6
src/bootchart/svg.c
View File

@ -630,12 +630,11 @@ static void svg_io_bi_bar(FILE *of,
pbi * (arg_scale_y * 5));
/* labels around highest value */
if (i == max_here) {
if (i == max_here)
fprintf(of, " <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
time_to_graph(sampledata->sampletime - graph_start) + 5,
((arg_scale_y * 5) - (pbi * (arg_scale_y * 5))) + 15,
max / 1024.0 / (interval / 1000000000.0));
}
i++;
prev_sampledata = sampledata;
@ -743,12 +742,11 @@ static void svg_io_bo_bar(FILE *of,
pbo * (arg_scale_y * 5));
/* labels around highest bo value */
if (i == max_here) {
if (i == max_here)
fprintf(of, " <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
time_to_graph(sampledata->sampletime - graph_start) + 5,
((arg_scale_y * 5) - (pbo * (arg_scale_y * 5))),
max / 1024.0 / (interval / 1000000000.0));
}
i++;
prev_sampledata = sampledata;

3
src/core/load-fragment.c
View File

@ -3568,12 +3568,11 @@ int unit_load_fragment(Unit *u) {
if (r < 0)
return r;
if (u->load_state == UNIT_STUB) {
if (u->load_state == UNIT_STUB)
/* Hmm, this didn't work? Then let's get rid
* of the fragment path stored for us, so that
* we don't point to an invalid location. */
u->fragment_path = mfree(u->fragment_path);
}
}
/* Look for a template */

3
src/core/main.c
View File

@ -1204,12 +1204,11 @@ static int status_welcome(void) {
"PRETTY_NAME", &pretty_name,
"ANSI_COLOR", &ansi_color,
NULL);
if (r == -ENOENT) {
if (r == -ENOENT)
r = parse_env_file("/usr/lib/os-release", NEWLINE,
"PRETTY_NAME", &pretty_name,
"ANSI_COLOR", &ansi_color,
NULL);
}
if (r < 0 && r != -ENOENT)
log_warning_errno(r, "Failed to read os-release file: %m");

3
src/core/manager.c
View File

@ -2792,9 +2792,8 @@ static void trim_generator_dir(Manager *m, char **generator) {
if (!*generator)
return;
if (rmdir(*generator) >= 0) {
if (rmdir(*generator) >= 0)
*generator = mfree(*generator);
}
return;
}

3
src/core/service.c
View File

@ -695,13 +695,12 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
fprintf(f, "%sStatus Text: %s\n",
prefix, s->status_text);
if (s->n_fd_store_max > 0) {
if (s->n_fd_store_max > 0)
fprintf(f,
"%sFile Descriptor Store Max: %u\n"
"%sFile Descriptor Store Current: %u\n",
prefix, s->n_fd_store_max,
prefix, s->n_fd_store);
}
}
static int service_load_pid_file(Service *s, bool may_warn) {

4
src/core/transaction.c
View File

@ -380,12 +380,10 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
"Found dependency on %s/%s",
k->unit->id, job_type_to_string(k->type));
if (!delete && hashmap_get(tr->jobs, k->unit) &&
!unit_matters_to_anchor(k->unit, k)) {
if (!delete && hashmap_get(tr->jobs, k->unit) && !unit_matters_to_anchor(k->unit, k))
/* Ok, we can drop this one, so let's
* do so. */
delete = k;
}
/* Check if this in fact was the beginning of
* the cycle */

3
src/cryptsetup/cryptsetup.c
View File

@ -329,12 +329,11 @@ static int get_password(const char *vol, const char *src, usec_t until, bool acc
description = disk_description(src);
mount_point = disk_mount_point(vol);
if (description && streq(vol, description)) {
if (description && streq(vol, description))
/* If the description string is simply the
* volume name, then let's not show this
* twice */
description = mfree(description);
}
if (mount_point && description)
r = asprintf(&name_buffer, "%s (%s) on %s", description, vol, mount_point);

3
src/hostname/hostnamed.c
View File

@ -113,12 +113,11 @@ static int context_read_data(Context *c) {
"PRETTY_NAME", &c->data[PROP_OS_PRETTY_NAME],
"CPE_NAME", &c->data[PROP_OS_CPE_NAME],
NULL);
if (r == -ENOENT) {
if (r == -ENOENT)
r = parse_env_file("/usr/lib/os-release", NEWLINE,
"PRETTY_NAME", &c->data[PROP_OS_PRETTY_NAME],
"CPE_NAME", &c->data[PROP_OS_CPE_NAME],
NULL);
}
if (r < 0 && r != -ENOENT)
return r;

5
src/import/importd.c
View File

@ -600,12 +600,9 @@ static int manager_on_notify(sd_event_source *s, int fd, uint32_t revents, void
cmsg_close_all(&msghdr);
CMSG_FOREACH(cmsg, &msghdr) {
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDENTIALS &&
cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) {
if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS && cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred)))
ucred = (struct ucred*) CMSG_DATA(cmsg);
}
}
if (msghdr.msg_flags & MSG_TRUNC) {

3
src/journal-remote/journal-gatewayd.c
View File

@ -337,9 +337,8 @@ static int request_parse_range(
return -ENOMEM;
m->cursor[strcspn(m->cursor, WHITESPACE)] = 0;
if (isempty(m->cursor)) {
if (isempty(m->cursor))
m->cursor = mfree(m->cursor);
}
return 0;
}

3
src/journal-remote/journal-upload-journal.c
View File

@ -374,10 +374,9 @@ int open_journal_for_upload(Uploader *u,
if (cursor) {
r = sd_journal_seek_cursor(j, cursor);
if (r < 0) {
if (r < 0)
return log_error_errno(r, "Failed to seek to cursor %s: %m",
cursor);
}
}
return process_journal_input(u, 1 + !!after_cursor);

3
src/journal/journald-audit.c
View File

@ -324,10 +324,9 @@ static int map_all_fields(
if (r < 0)
return log_debug_errno(r, "Failed to parse audit array: %m");
if (r == 0) {
if (r == 0)
/* Couldn't process as generic field, let's just skip over it */
p += strcspn(p, WHITESPACE);
}
}
}
}

3
src/journal/test-journal-verify.c
View File

@ -118,12 +118,11 @@ int main(int argc, char *argv[]) {
assert_se(journal_file_verify(f, verification_key, &from, &to, &total, true) >= 0);
if (verification_key && JOURNAL_HEADER_SEALED(f->header)) {
if (verification_key && JOURNAL_HEADER_SEALED(f->header))
log_info("=> Validated from %s to %s, %s missing",
format_timestamp(a, sizeof(a), from),
format_timestamp(b, sizeof(b), to),
format_timespan(c, sizeof(c), total > to ? total - to : 0, 0));
}
journal_file_close(f);

3
src/libsystemd-network/sd-ipv4ll.c
View File

@ -463,9 +463,8 @@ int sd_ipv4ll_get_address(sd_ipv4ll *ll, struct in_addr *address){
assert_return(ll, -EINVAL);
assert_return(address, -EINVAL);
if (ll->claimed_address == 0) {
if (ll->claimed_address == 0)
return -ENOENT;
}
address->s_addr = ll->claimed_address;
return 0;

3
src/libsystemd/sd-bus/bus-creds.c
View File

@ -1014,9 +1014,8 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) {
if (r != -EPERM && r != -EACCES)
return r;
} else {
if (c->cmdline_size == 0) {
if (c->cmdline_size == 0)
c->cmdline = mfree(c->cmdline);
}
c->mask |= SD_BUS_CREDS_CMDLINE;
}

3
src/libsystemd/sd-netlink/netlink-message.c
View File

@ -898,10 +898,9 @@ int sd_netlink_message_rewind(sd_netlink_message *m) {
m->n_containers = 0;
if (m->containers[0].attributes) {
if (m->containers[0].attributes)
/* top-level attributes have already been parsed */
return 0;
}
assert(m->hdr);

3
src/login/logind-button.c
View File

@ -66,12 +66,11 @@ void button_free(Button *b) {
sd_event_source_unref(b->io_event_source);
sd_event_source_unref(b->check_event_source);
if (b->fd >= 0) {
if (b->fd >= 0)
/* If the device has been unplugged close() returns
* ENODEV, let's ignore this, hence we don't use
* safe_close() */
(void) close(b->fd);
}
free(b->name);
free(b->seat);

3
src/machine/machinectl.c
View File

@ -597,7 +597,7 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
printf("\t Unit: %s\n", i->unit);
show_unit_cgroup(bus, i->unit, i->leader);
if (arg_transport == BUS_TRANSPORT_LOCAL) {
if (arg_transport == BUS_TRANSPORT_LOCAL)
show_journal_by_unit(
stdout,
@ -611,7 +611,6 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
SD_JOURNAL_LOCAL_ONLY,
true,
NULL);
}
}
}

3
src/network/networkd-netdev-bond.c
View File

@ -204,9 +204,8 @@ static int netdev_bond_fill_message_create(NetDev *netdev, Link *link, sd_netlin
if (b->lacp_rate != _NETDEV_BOND_LACP_RATE_INVALID &&
b->mode == NETDEV_BOND_MODE_802_3AD) {
r = sd_netlink_message_append_u8(m, IFLA_BOND_AD_LACP_RATE, b->lacp_rate );
if (r < 0) {
if (r < 0)
return log_netdev_error_errno(netdev, r, "Could not append IFLA_BOND_AD_LACP_RATE attribute: %m");
}
}
if (b->miimon != 0) {

3
src/random-seed/random-seed.c
View File

@ -54,10 +54,9 @@ int main(int argc, char *argv[]) {
/* Read pool size, if possible */
f = fopen("/proc/sys/kernel/random/poolsize", "re");
if (f) {
if (fscanf(f, "%zu", &buf_size) > 0) {
if (fscanf(f, "%zu", &buf_size) > 0)
/* poolsize is in bits on 2.6, but we want bytes */
buf_size /= 8;
}
fclose(f);
}

3
src/resolve-host/resolve-host.c
View File

@ -168,11 +168,10 @@ static int resolve_host(sd_bus *bus, const char *name) {
if (r < 0)
return bus_log_parse_error(r);
if (!streq(name, canonical)) {
if (!streq(name, canonical))
printf("%*s%s (%s)\n",
(int) strlen(name), c == 0 ? name : "", c == 0 ? ":" : " ",
canonical);
}
if (c == 0) {
log_error("%s: no addresses found", name);

3
src/resolve/resolved-dns-cache.c
View File

@ -241,12 +241,11 @@ static void dns_cache_item_update_positive(DnsCache *c, DnsCacheItem *i, DnsReso
i->type = DNS_CACHE_POSITIVE;
if (!i->by_key_prev) {
if (!i->by_key_prev)
/* We are the first item in the list, we need to
* update the key used in the hashmap */
assert_se(hashmap_replace(c->by_key, rr->key, i) >= 0);
}
dns_resource_record_ref(rr);
dns_resource_record_unref(i->rr);

3
src/shared/logs-show.c
View File

@ -334,10 +334,9 @@ static int output_short(
break;
case OUTPUT_SHORT_PRECISE:
r = strftime(buf, sizeof(buf), "%b %d %H:%M:%S", gettime_r(&t, &tm));
if (r > 0) {
if (r > 0)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
".%06llu", (unsigned long long) (x % USEC_PER_SEC));
}
break;
default:
r = strftime(buf, sizeof(buf), "%b %d %H:%M:%S", gettime_r(&t, &tm));

3
src/systemctl/systemctl.c
View File

@ -3585,7 +3585,7 @@ static void print_status_info(
}
}
if (i->id && arg_transport == BUS_TRANSPORT_LOCAL) {
if (i->id && arg_transport == BUS_TRANSPORT_LOCAL)
show_journal_by_unit(
stdout,
i->id,
@ -3598,7 +3598,6 @@ static void print_status_info(
SD_JOURNAL_LOCAL_ONLY,
arg_scope == UNIT_FILE_SYSTEM,
ellipsized);
}
if (i->need_daemon_reload)
warn_unit_file_changed(i->id);

3
src/udev/net/ethtool-util.c
View File

@ -54,9 +54,8 @@ int ethtool_connect(int *ret) {
assert_return(ret, -EINVAL);
fd = socket(PF_INET, SOCK_DGRAM, 0);
if (fd < 0) {
if (fd < 0)
return -errno;
}
*ret = fd;

3
src/udev/scsi_id/scsi_serial.c
View File

@ -577,9 +577,8 @@ static int check_fill_0x83_id(struct udev *udev,
if (id_search->id_type == SCSI_ID_NAA && wwn != NULL) {
strncpy(wwn, &serial[s], 16);
if (wwn_vendor_extension != NULL) {
if (wwn_vendor_extension != NULL)
strncpy(wwn_vendor_extension, &serial[s + 16], 16);
}
}
return 0;

6
src/udev/udev-ctrl.c
View File

@ -121,14 +121,12 @@ int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl) {
err = bind(uctrl->sock, &uctrl->saddr.sa, uctrl->addrlen);
}
if (err < 0) {
if (err < 0)
return log_error_errno(errno, "bind failed: %m");
}
err = listen(uctrl->sock, 0);
if (err < 0) {
if (err < 0)
return log_error_errno(errno, "listen failed: %m");
}
uctrl->bound = true;
uctrl->cleanup_socket = true;

3
src/udev/udev-rules.c
View File

@ -672,9 +672,8 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi
const char *key = udev_list_entry_get_name(list_entry);
const char *val = udev_list_entry_get_value(list_entry);
if (fnmatch(filter, key, 0) == 0) {
if (fnmatch(filter, key, 0) == 0)
udev_device_add_property(dev, key, val);
}
}
return 0;
}

3
src/udev/udevd.c
View File

@ -1670,9 +1670,8 @@ int main(int argc, char *argv[]) {
arg_children_max = 8;
if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) {
if (sched_getaffinity(0, sizeof(cpu_set), &cpu_set) == 0)
arg_children_max += CPU_COUNT(&cpu_set) * 2;
}
log_debug("set children_max to %u", arg_children_max);
}

4
src/update-utmp/update-utmp.c
View File

@ -210,11 +210,9 @@ static int on_runlevel(Context *c) {
runlevel > 0 ? runlevel : 'N') < 0)
return log_oom();
if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 &&
errno != EPERM) {
if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 && errno != EPERM)
r = log_error_errno(errno,
"Failed to send audit message: %m");
}
}
#endif

3
src/user-sessions/user-sessions.c
View File

@ -42,10 +42,9 @@ int main(int argc, char*argv[]) {
if (streq(argv[1], "start")) {
int r = 0;
if (unlink("/run/nologin") < 0 && errno != ENOENT) {
if (unlink("/run/nologin") < 0 && errno != ENOENT)
r = log_error_errno(errno,
"Failed to remove /run/nologin file: %m");
}
if (unlink("/etc/nologin") < 0 && errno != ENOENT) {
/* If the file doesn't exist and /etc simply