From 920b52e4909d9dc812817fd8b82f83ca23a11c91 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Mon, 8 Jun 2015 20:53:16 +0200 Subject: [PATCH] tree-wide: remove spurious space --- src/core/busname.c | 2 +- src/core/manager.c | 2 +- src/core/socket.c | 4 ++-- src/libsystemd-network/lldp-tlv.c | 2 +- src/network/networkctl.c | 2 +- src/network/networkd-ipv4ll.c | 2 +- src/nss-resolve/nss-resolve.c | 14 +++++++------- src/shared/efivars.c | 2 +- src/udev/udev-event.c | 6 +++--- src/udev/udev-rules.c | 2 +- src/udev/udevd.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/core/busname.c b/src/core/busname.c index 11f3b98..3f5abbc 100644 --- a/src/core/busname.c +++ b/src/core/busname.c @@ -125,7 +125,7 @@ static int busname_arm_timer(BusName *n) { return sd_event_source_set_enabled(n->timer_event_source, SD_EVENT_ONESHOT); } - r = sd_event_add_time( + r = sd_event_add_time( UNIT(n)->manager->event, &n->timer_event_source, CLOCK_MONOTONIC, diff --git a/src/core/manager.c b/src/core/manager.c index a1c5433..564fb5d 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -665,7 +665,7 @@ static int manager_setup_notify(Manager *m) { if (m->notify_fd < 0) { _cleanup_close_ int fd = -1; - union sockaddr_union sa = { + union sockaddr_union sa = { .sa.sa_family = AF_UNIX, }; static const int one = 1; diff --git a/src/core/socket.c b/src/core/socket.c index fc5eb14..0239962 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -832,7 +832,7 @@ static void socket_apply_socket_options(Socket *s, int fd) { } if (s->keep_alive_interval) { - int value = s->keep_alive_interval / USEC_PER_SEC; + int value = s->keep_alive_interval / USEC_PER_SEC; if (setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &value, sizeof(value)) < 0) log_unit_warning_errno(UNIT(s), errno, "TCP_KEEPINTVL failed: %m"); } @@ -2589,7 +2589,7 @@ static void socket_trigger_notify(Unit *u, Unit *other) { /* Don't propagate state changes from the service if we are already down or accepting connections */ - if ((s->state != SOCKET_RUNNING && + if ((s->state != SOCKET_RUNNING && s->state != SOCKET_LISTENING) || s->accept) return; diff --git a/src/libsystemd-network/lldp-tlv.c b/src/libsystemd-network/lldp-tlv.c index e32783f..0cea5b1 100644 --- a/src/libsystemd-network/lldp-tlv.c +++ b/src/libsystemd-network/lldp-tlv.c @@ -221,7 +221,7 @@ int tlv_packet_read_string(tlv_packet *m, char **data, uint16_t *data_length) { return r; *data = (char *) val; - *data_length = m->container->length; + *data_length = m->container->length; m->container->read_pos += m->container->length; diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 3454394..68925de 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -814,7 +814,7 @@ static char *lldp_system_caps(uint16_t cap) { } if (cap & LLDP_SYSTEM_CAPABILITIES_ROUTER) { - s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_ROUTER), " ", NULL); + s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_ROUTER), " ", NULL); if (!s) return NULL; diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c index 8050801..74b3dea 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/network/networkd-ipv4ll.c @@ -34,7 +34,7 @@ static int ipv4ll_address_lost(Link *link) { assert(link); link->ipv4ll_route = false; - link->ipv4ll_address = false; + link->ipv4ll_address = false; r = sd_ipv4ll_get_address(link->ipv4ll, &addr); if (r < 0) diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index bc6c5dc..8f181a6 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -365,13 +365,13 @@ enum nss_status _nss_resolve_gethostbyname3_r( int32_t *ttlp, char **canonp); - fallback = (enum nss_status (*)(const char *name, - int af, - struct hostent *result, - char *buffer, size_t buflen, - int *errnop, int *h_errnop, - int32_t *ttlp, - char **canonp)) + fallback = (enum nss_status (*)(const char *name, + int af, + struct hostent *result, + char *buffer, size_t buflen, + int *errnop, int *h_errnop, + int32_t *ttlp, + char **canonp)) find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname3_r"); if (fallback) return fallback(name, af, result, buffer, buflen, errnop, h_errnop, ttlp, canonp); diff --git a/src/shared/efivars.c b/src/shared/efivars.c index d34d977..0d6ecf5 100644 --- a/src/shared/efivars.c +++ b/src/shared/efivars.c @@ -483,7 +483,7 @@ int efi_add_boot_option(uint16_t id, const char *title, devicep->length = offsetof(struct device_path, drive) + sizeof(struct drive_path); devicep->drive.part_nr = part; devicep->drive.part_start = pstart; - devicep->drive.part_size = psize; + devicep->drive.part_size = psize; devicep->drive.signature_type = SIGNATURE_TYPE_GUID; devicep->drive.mbr_type = MBR_TYPE_EFI_PARTITION_TABLE_HEADER; id128_to_efi_guid(part_uuid, devicep->drive.signature); diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 4dcf8f2..8d17c5e 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -631,9 +631,9 @@ static int spawn_wait(struct udev_event *event, if (timeout_warn_usec > 0 && timeout_warn_usec < timeout_usec && age_usec < timeout_warn_usec) { spawn.timeout_warn = timeout_warn_usec - age_usec; - r = sd_event_add_time(e, NULL, clock_boottime_or_monotonic(), - usec + spawn.timeout_warn, USEC_PER_SEC, - on_spawn_timeout_warning, &spawn); + r = sd_event_add_time(e, NULL, clock_boottime_or_monotonic(), + usec + spawn.timeout_warn, USEC_PER_SEC, + on_spawn_timeout_warning, &spawn); if (r < 0) return r; } diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 9153715..7be9a23 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1941,7 +1941,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(event->dev)) { const char *devlink; - devlink = udev_list_entry_get_name(list_entry) + strlen("/dev/"); + devlink = udev_list_entry_get_name(list_entry) + strlen("/dev/"); if (match_key(rules, cur, devlink) == 0) { match = true; break; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index eb43091..26aae89 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1638,7 +1638,7 @@ int main(int argc, char *argv[]) { arg_children_max = 8; if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { - arg_children_max += CPU_COUNT(&cpu_set) * 2; + arg_children_max += CPU_COUNT(&cpu_set) * 2; } log_debug("set children_max to %u", arg_children_max); -- 2.7.4