tree-wide: replace tab with space, adjust missing or duplicated space

diff --git a/shell-completion/zsh/_sd_bus_address b/shell-completion/zsh/_sd_bus_address
index a3b91050cb764c11de274224583193e44db6f2f8..10d0d38c1b1d1e7bad6accc113a161914109c948 100644 (file)
--- a/shell-completion/zsh/_sd_bus_address
+++ b/shell-completion/zsh/_sd_bus_address
@@ -4,47 +4,47 @@ local context state state_descr line
 typeset -A val_args
 
 _values -S: kind \
-       'unix[a unix domain socket]:unix properties:->unix' \
-       'tcp[a tcp socket]:tcp properties:->tcp' \
-       'unixexec[a process]:unixexec properties:->unixexec' \
-       'x-machine-unix[a container]:machine properties:->x-machine-unix'
+    'unix[a unix domain socket]:unix properties:->unix' \
+    'tcp[a tcp socket]:tcp properties:->tcp' \
+    'unixexec[a process]:unixexec properties:->unixexec' \
+    'x-machine-unix[a container]:machine properties:->x-machine-unix'
 
 _sd_bus_get_guid() {
-       local TYPE VALUE
-       local -a busname=(org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus)
+    local TYPE VALUE
+    local -a busname=(org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus)
 
-       _call_program -l dbus-guid busctl call $busname GetId |
-       while read TYPE VALUE; do
-               [[ $TYPE == 's' && -n $VALUE ]] && compadd "$@" - ${(Q)VALUE};
-       done
+    _call_program -l dbus-guid busctl call $busname GetId |
+    while read TYPE VALUE; do
+        [[ $TYPE == 's' && -n $VALUE ]] && compadd "$@" - ${(Q)VALUE};
+    done
 }
 
 local expl ret
 case $context in
-       unix)
-               _values -s, 'unix socket properties' \
-                       'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
-                       '(abstract)path[unix domain socket path]:path:_files -r, -g "*(=)"' \
-                       '(path)abstract[unix domain socket path in the abstract namespace]:abstract path:_files -r, -P@ -g "*(=)"' \
-                       'uid[unix uid]:uid:_numbers' \
-                       'gid[unix gid]:gid:_numbers'
-               ;;
-       tcp)
-               _values -s, 'unix socket properties' \
-                       'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
-                       'host[hostname]:hostname:_hosts -r,'\
-                       'port[port]:port:_numbers' \
-                       'family[address family]:address family:(ipv4 ipv6)'
-               ;;
-       unixexec)
-               _values -s, 'unixexec properties' \
-                       'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
-                       'path[command path]:command path:_absolute_command_paths -r,'\
-               ;;
-       x-machine-unix)
-               _values -s, 'machine properties' \
-                       'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
-                       '(pid)machine[machine]:machine:_call_function ret _sd_machines' \
-                       '(machine)pid[pid]:pid:_pids'
-               ;;
+    unix)
+        _values -s, 'unix socket properties' \
+            'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
+            '(abstract)path[unix domain socket path]:path:_files -r, -g "*(=)"' \
+            '(path)abstract[unix domain socket path in the abstract namespace]:abstract path:_files -r, -P@ -g "*(=)"' \
+            'uid[unix uid]:uid:_numbers' \
+            'gid[unix gid]:gid:_numbers'
+        ;;
+    tcp)
+        _values -s, 'unix socket properties' \
+            'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
+            'host[hostname]:hostname:_hosts -r,'\
+            'port[port]:port:_numbers' \
+            'family[address family]:address family:(ipv4 ipv6)'
+        ;;
+    unixexec)
+        _values -s, 'unixexec properties' \
+            'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
+            'path[command path]:command path:_absolute_command_paths -r,'\
+        ;;
+    x-machine-unix)
+        _values -s, 'machine properties' \
+            'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
+            '(pid)machine[machine]:machine:_call_function ret _sd_machines' \
+            '(machine)pid[pid]:pid:_pids'
+        ;;
 esac

diff --git a/src/basic/pcapng.h b/src/basic/pcapng.h
index d4181520a68dff362dc9e6d6552f4499d6dfef3b..ea7516082d181fff871fc2e66f2332aa89e27a6d 100644 (file)
--- a/src/basic/pcapng.h
+++ b/src/basic/pcapng.h
@@ -11,7 +11,7 @@
  */
 enum pcapng_block_types {
         PCAPNG_INTERFACE_BLOCK = 1,
-        PCAPNG_PACKET_BLOCK,           /* Obsolete */
+        PCAPNG_PACKET_BLOCK, /* Obsolete */
         PCAPNG_SIMPLE_PACKET_BLOCK,
         PCAPNG_NAME_RESOLUTION_BLOCK,
         PCAPNG_INTERFACE_STATS_BLOCK,
@@ -51,7 +51,7 @@ enum pcapng_section_opt {
 };
 
 struct pcapng_interface_block {
-        uint32_t block_type;   /* 1 */
+        uint32_t block_type;   /* 1 */
         uint32_t block_length;
         uint16_t link_type;
         uint16_t reserved;
@@ -59,7 +59,7 @@ struct pcapng_interface_block {
 };
 
 enum pcapng_interface_options {
-        PCAPNG_IFB_NAME         = 2,
+        PCAPNG_IFB_NAME = 2,
         PCAPNG_IFB_DESCRIPTION,
         PCAPNG_IFB_IPV4ADDR,
         PCAPNG_IFB_IPV6ADDR,
@@ -76,7 +76,7 @@ enum pcapng_interface_options {
 };
 
 struct pcapng_enhance_packet_block {
-        uint32_t block_type;   /* 6 */
+        uint32_t block_type; /* 6 */
         uint32_t block_length;
         uint32_t interface_id;
         uint32_t timestamp_hi;
@@ -99,7 +99,7 @@ enum pcapng_epb_options {
 };
 
 struct pcapng_statistics_block {
-        uint32_t block_type;   /* 5 */
+        uint32_t block_type; /* 5 */
         uint32_t block_length;
         uint32_t interface_id;
         uint32_t timestamp_hi;

diff --git a/src/core/execute-serialize.c b/src/core/execute-serialize.c
index f7a669d9c3b2307c52fd7f777ffc36635a8fb734..02435447d730d772f678936d4ef1aa0542f104fb 100644 (file)
--- a/src/core/execute-serialize.c
+++ b/src/core/execute-serialize.c
@@ -2622,7 +2622,7 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) {
                                 return r;
                 } else if ((val = startswith(l, "exec-context-root-hash-sig="))) {
                         iovec_done(&c->root_hash_sig);
-                        r= unbase64mem(val, &c->root_hash_sig.iov_base, &c->root_hash_sig.iov_len);
+                        r = unbase64mem(val, &c->root_hash_sig.iov_base, &c->root_hash_sig.iov_len);
                         if (r < 0)
                                 return r;
                 } else if ((val = startswith(l, "exec-context-root-ephemeral="))) {

diff --git a/src/fundamental/efi-fundamental.h b/src/fundamental/efi-fundamental.h
index 967e92f5995b809822a120cda9160fe7b5429694..100e8410e8533e3b38335cc445122bb4f8086641 100644 (file)
--- a/src/fundamental/efi-fundamental.h
+++ b/src/fundamental/efi-fundamental.h
@@ -21,7 +21,7 @@ static inline bool efi_guid_equal(const EFI_GUID *a, const EFI_GUID *b) {
 
 typedef struct {
         EFI_GUID SignatureOwner;
-        uint8_t        SignatureData[];
+        uint8_t SignatureData[];
 } EFI_SIGNATURE_DATA;
 
 typedef struct {

diff --git a/src/portable/profile/default/service.conf b/src/portable/profile/default/service.conf
index 2cb54d84c3c9a9e4cf8db925c1b2c78f82aa1aa9..4e880cfec020f0811ae09e4d3a00dc3097ab8e95 100644 (file)
--- a/src/portable/profile/default/service.conf
+++ b/src/portable/profile/default/service.conf
@@ -9,9 +9,9 @@ BindReadOnlyPaths=/run/dbus/system_bus_socket
 DynamicUser=yes
 RemoveIPC=yes
 CapabilityBoundingSet=CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER \
-       CAP_FSETID CAP_IPC_LOCK CAP_IPC_OWNER CAP_KILL CAP_MKNOD CAP_NET_ADMIN \
-       CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_SETGID CAP_SETPCAP \
-       CAP_SETUID CAP_SYS_ADMIN CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_RESOURCE
+                      CAP_FSETID CAP_IPC_LOCK CAP_IPC_OWNER CAP_KILL CAP_MKNOD CAP_NET_ADMIN \
+                      CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_SETGID CAP_SETPCAP \
+                      CAP_SETUID CAP_SYS_ADMIN CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_RESOURCE
 PrivateDevices=yes
 PrivateUsers=yes
 ProtectSystem=strict

diff --git a/src/portable/profile/nonetwork/service.conf b/src/portable/profile/nonetwork/service.conf
index 29b7d6f62209eaddfeb7505709ff4e1efae1b4b9..2d0db5ba51cd000a1b9df3441ce54924f5f1a968 100644 (file)
--- a/src/portable/profile/nonetwork/service.conf
+++ b/src/portable/profile/nonetwork/service.conf
@@ -8,8 +8,8 @@ BindReadOnlyPaths=/run/dbus/system_bus_socket
 DynamicUser=yes
 RemoveIPC=yes
 CapabilityBoundingSet=CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER \
-       CAP_FSETID CAP_IPC_LOCK CAP_IPC_OWNER CAP_KILL CAP_MKNOD CAP_SETGID CAP_SETPCAP \
-       CAP_SETUID CAP_SYS_ADMIN CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_RESOURCE
+                      CAP_FSETID CAP_IPC_LOCK CAP_IPC_OWNER CAP_KILL CAP_MKNOD CAP_SETGID CAP_SETPCAP \
+                      CAP_SETUID CAP_SYS_ADMIN CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_RESOURCE
 PrivateDevices=yes
 PrivateUsers=yes
 ProtectSystem=strict

diff --git a/src/sysupdate/sysupdated.c b/src/sysupdate/sysupdated.c
index ac0e6f8e817109a070fc7e05fdff6b2cacfac0ad..d22a7d88a827091b081b4b6b4cdab6b34987b307 100644 (file)
--- a/src/sysupdate/sysupdated.c
+++ b/src/sysupdate/sysupdated.c
@@ -2037,14 +2037,14 @@ static int manager_add_bus_objects(Manager *m) {
 static bool manager_is_idle(void *userdata) {
         Manager *m = ASSERT_PTR(userdata);
 
-       return hashmap_isempty(m->jobs);
+        return hashmap_isempty(m->jobs);
 }
 
 static void manager_check_idle(Manager *m) {
-       assert(m);
+        assert(m);
 
-       if (!hashmap_isempty(m->jobs))
-               return;
+        if (!hashmap_isempty(m->jobs))
+                return;
 
         hashmap_clear(m->targets);
         log_debug("Cleared target cache");

diff --git a/src/sysupdate/updatectl.c b/src/sysupdate/updatectl.c
index 754f254987f26af9ceefc710ac98da01aa74d21a..5eae86e4ea47d72f35319d9838ddf9d8dbf9f93d 100644 (file)
--- a/src/sysupdate/updatectl.c
+++ b/src/sysupdate/updatectl.c
@@ -655,7 +655,7 @@ static int check_describe_finished(sd_bus_message *reply, void *userdata, sd_bus
         _cleanup_(version_done) Version v = {};
         _cleanup_free_ char *update = NULL;
         const sd_bus_error *e;
-       sd_bus_error error = {};
+        sd_bus_error error = {};
         const char *lnk = NULL;
         char *current;
         int r;

diff --git a/test/units/TEST-35-LOGIN.sh b/test/units/TEST-35-LOGIN.sh
index d4a07faca135b111af5c2f39dd757691c15ab724..e536e0ae5ca1515060313969770f1ee3369a6a5e 100755 (executable)
--- a/test/units/TEST-35-LOGIN.sh
+++ b/test/units/TEST-35-LOGIN.sh
@@ -595,7 +595,7 @@ testcase_list_users_sessions_seats() {
     systemd-run --quiet --service-type=notify --unit=test-linger-signal-wait --pty \
                 -p Environment=SYSTEMD_LOG_LEVEL=debug \
                 -p ExecStartPost="loginctl enable-linger logind-test-user" \
-               busctl --timeout=30 wait "/org/freedesktop/login1/user/_$(id -ru logind-test-user)" org.freedesktop.DBus.Properties PropertiesChanged | grep -qF '"Linger" b true'
+                busctl --timeout=30 wait "/org/freedesktop/login1/user/_$(id -ru logind-test-user)" org.freedesktop.DBus.Properties PropertiesChanged | grep -qF '"Linger" b true'
     assert_eq "$(loginctl list-users --no-legend | awk '$2 == "logind-test-user" { print $3 }')" yes
 
     for s in $(loginctl list-sessions --no-legend | grep tty | awk '$3 == "logind-test-user" { print $1 }'); do
@@ -797,7 +797,7 @@ testcase_restart() {
 
     for c in $classes; do
         unit="user-sleeper-$c.service"
-        systemd-run --service-type=notify run0  --setenv XDG_SESSION_CLASS="$c" -u logind-test-user --unit="$unit" sleep infinity
+        systemd-run --service-type=notify run0 --setenv XDG_SESSION_CLASS="$c" -u logind-test-user --unit="$unit" sleep infinity
     done
 
     systemctl restart systemd-logind

diff --git a/test/units/TEST-89-RESOLVED-MDNS.sh b/test/units/TEST-89-RESOLVED-MDNS.sh
index b6e200582f708caef586f95e6e0aa0f46c320ef0..a7062b813a8ecf2bf04d8e395f539a7f95994f88 100755 (executable)
--- a/test/units/TEST-89-RESOLVED-MDNS.sh
+++ b/test/units/TEST-89-RESOLVED-MDNS.sh
@@ -146,7 +146,7 @@ run_and_check_services() {
             # jq --slurp --raw-output \
             #     ".[].browser_service_data[] | select(.updateFlag == true and .type == \"$service_type\" and .family == 10).name" "$out_file" | sort | tee "$tmp_file"
             grep -o '"name":"[^"]*"' "$out_file" | sed 's/"name":"//;s/"//g' | sort | tee "$tmp_file"
-           # ...and compare them with what we expect
+            # ...and compare them with what we expect
             if "$check_func" "$service_id" "$tmp_file"; then
                 return 0
             fi