From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 26 Nov 2018 02:53:21 +0000 (+0900)
Subject: udev: drop duplicate whitespaces
X-Git-Tag: v240~221^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10927%2Fhead;p=thirdparty%2Fsystemd.git

udev: drop duplicate whitespaces
---

diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index 177b273e486..bc0deaf347c 100644
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -574,7 +574,7 @@ static int set_sset(int fd, struct ifreq *ifr, const struct ethtool_link_usettin
 
 /* If autonegotiation is disabled, the speed and duplex represent the fixed link
  * mode and are writable if the driver supports multiple link modes. If it is
- * enabled then they are read-only. If the link  is up they represent the negotiated
+ * enabled then they are read-only. If the link is up they represent the negotiated
  * link mode; if the link is down, the speed is 0, %SPEED_UNKNOWN or the highest
  * enabled speed and @duplex is %DUPLEX_UNKNOWN or the best enabled duplex mode.
  */
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index becaffe0d6c..6703a9d7a38 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -370,7 +370,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
         if (r < 0) {
 
                 if (config->port != _NET_DEV_PORT_INVALID)
-                        log_warning_errno(r,  "Could not set port (%s) of %s: %m", port_to_string(config->port), old_name);
+                        log_warning_errno(r, "Could not set port (%s) of %s: %m", port_to_string(config->port), old_name);
 
                 if (!eqzero(config->advertise))
                         log_warning_errno(r, "Could not set advertise mode: %m"); /* TODO: include modes in the log message. */
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index 2df3d92acf6..cb49a17c33d 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -193,7 +193,7 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) {
                                 keycode++;
 
                                 release[release_count] = scancode;
-                                if (release_count <  ELEMENTSOF(release)-1)
+                                if (release_count < ELEMENTSOF(release)-1)
                                         release_count++;
 
                                 if (keycode[0] == '\0')
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index c4abe4fc7e2..6ea74c7bf70 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -245,7 +245,7 @@ static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int
                 pfd[0].fd = uctrl->sock;
                 pfd[0].events = POLLIN;
                 r = poll(pfd, 1, timeout * MSEC_PER_SEC);
-                if (r  < 0) {
+                if (r < 0) {
                         if (errno == EINTR)
                                 continue;
                         err = -errno;
@@ -327,7 +327,7 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn) {
                 pfd[0].events = POLLIN;
 
                 r = poll(pfd, 1, 10000);
-                if (r  < 0) {
+                if (r < 0) {
                         if (errno == EINTR)
                                 continue;
                         goto err;
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index c8f068b0b77..f6f640a2161 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -203,7 +203,7 @@ struct token {
                         union {
                                 unsigned attr_off;
                                 unsigned rule_goto;
-                                mode_t  mode;
+                                mode_t mode;
                                 uid_t uid;
                                 gid_t gid;
                                 int devlink_prio;
@@ -234,7 +234,7 @@ static const char *operation_str(enum operation_type type) {
                 [OP_REMOVE] =           "remove",
                 [OP_ASSIGN] =           "assign",
                 [OP_ASSIGN_FINAL] =     "assign-final",
-}        ;
+        };
 
         return operation_strs[type];
 }