diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index 1d9203fcff..abd9367723 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -196,10 +196,10 @@ - Do not print passwords to standard output. - This is useful if you want to store a password in kernel - keyring with but do not want it - to show up on screen or in logs. + Do not print passwords to standard output. + This is useful if you want to store a password in kernel + keyring with but do not want it + to show up on screen or in logs. diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 5d7b6ca12a..3ead519d07 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -146,8 +146,8 @@ - Format byte counts (as in memory usage and I/O metrics) - with raw numeric values rather than human-readable + Format byte counts (as in memory usage and I/O metrics) + with raw numeric values rather than human-readable numbers. diff --git a/man/udevadm.xml b/man/udevadm.xml index 60f43b2b4a..3a862f540b 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -298,11 +298,11 @@ - Trigger events for devices for which the last component - (i.e. the filename) of the /sys path matches - the specified PATH. This option can be - specified multiple times and also supports shell style pattern - matching. + Trigger events for devices for which the last component + (i.e. the filename) of the /sys path matches + the specified PATH. This option can be + specified multiple times and also supports shell style pattern + matching. diff --git a/src/basic/MurmurHash2.c b/src/basic/MurmurHash2.c index 47adfb4d0a..5859af0a81 100644 --- a/src/basic/MurmurHash2.c +++ b/src/basic/MurmurHash2.c @@ -30,7 +30,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") // Other compilers -#else // defined(_MSC_VER) +#else // defined(_MSC_VER) #define BIG_CONSTANT(x) (x##LLU) diff --git a/src/basic/MurmurHash2.h b/src/basic/MurmurHash2.h index 93362dd485..6104b4fbe6 100644 --- a/src/basic/MurmurHash2.h +++ b/src/basic/MurmurHash2.h @@ -18,7 +18,7 @@ typedef unsigned __int64 uint64_t; // Other compilers -#else // defined(_MSC_VER) +#else // defined(_MSC_VER) #include diff --git a/src/basic/mempool.h b/src/basic/mempool.h index 68249cd881..ba0c0bd8f9 100644 --- a/src/basic/mempool.h +++ b/src/basic/mempool.h @@ -29,7 +29,6 @@ static struct mempool pool_name = { \ .at_least = alloc_at_least, \ } - #if VALGRIND void mempool_drop(struct mempool *mp); #endif diff --git a/src/basic/missing.h b/src/basic/missing.h index 9fe750ae28..e714078f31 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -329,7 +329,6 @@ struct btrfs_ioctl_search_header { __u32 len; }; - struct btrfs_ioctl_search_args { struct btrfs_ioctl_search_key key; char buf[BTRFS_SEARCH_ARGS_BUFSIZE]; diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h index 42ada30d52..89ca1f062a 100644 --- a/src/basic/missing_syscall.h +++ b/src/basic/missing_syscall.h @@ -256,7 +256,6 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i # define kcmp missing_kcmp #endif - /* ======================================================================= */ #if !HAVE_KEYCTL diff --git a/src/basic/string-table.h b/src/basic/string-table.h index 92825c4d79..1786bcfda0 100644 --- a/src/basic/string-table.h +++ b/src/basic/string-table.h @@ -77,7 +77,6 @@ ssize_t string_table_lookup(const char * const *table, size_t len, const char *k return (type) -1; \ } \ - #define _DEFINE_STRING_TABLE_LOOKUP(name,type,scope) \ _DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,scope) \ _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING(name,type,scope) diff --git a/src/basic/strxcpyx.h b/src/basic/strxcpyx.h index 99213e0f35..7f49f92ad8 100644 --- a/src/basic/strxcpyx.h +++ b/src/basic/strxcpyx.h @@ -7,7 +7,6 @@ Copyright 2013 Kay Sievers ***/ - #include #include "macro.h" diff --git a/src/core/dbus-automount.h b/src/core/dbus-automount.h index 6ad89843cc..2d4079a7b4 100644 --- a/src/core/dbus-automount.h +++ b/src/core/dbus-automount.h @@ -7,7 +7,6 @@ Copyright 2010 Lennart Poettering ***/ - extern const sd_bus_vtable bus_automount_vtable[]; int bus_automount_set_property(Unit *u, const char *name, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error); diff --git a/src/libsystemd/sd-netlink/local-addresses.h b/src/libsystemd/sd-netlink/local-addresses.h index 701d17b614..f1f4db78ab 100644 --- a/src/libsystemd/sd-netlink/local-addresses.h +++ b/src/libsystemd/sd-netlink/local-addresses.h @@ -7,7 +7,6 @@ Copyright 2008-2011 Lennart Poettering ***/ - #include "sd-netlink.h" #include "in-addr-util.h" diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h index d5a8f390bc..1b787ccec9 100644 --- a/src/libudev/libudev.h +++ b/src/libudev/libudev.h @@ -187,7 +187,6 @@ struct udev_list_entry *udev_hwdb_get_properties_list_entry(struct udev_hwdb *hw */ int udev_util_encode_string(const char *str, char *str_enc, size_t len); - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/login/logind-inhibit.h b/src/login/logind-inhibit.h index 32626118eb..712260a5a1 100644 --- a/src/login/logind-inhibit.h +++ b/src/login/logind-inhibit.h @@ -9,7 +9,6 @@ typedef struct Inhibitor Inhibitor; - typedef enum InhibitWhat { INHIBIT_SHUTDOWN = 1, INHIBIT_SLEEP = 2, diff --git a/src/network/netdev/ipvlan.h b/src/network/netdev/ipvlan.h index 85c472100b..b1d32d10e9 100644 --- a/src/network/netdev/ipvlan.h +++ b/src/network/netdev/ipvlan.h @@ -12,7 +12,6 @@ #include "missing.h" #include "netdev/netdev.h" - typedef enum IPVlanMode { NETDEV_IPVLAN_MODE_L2 = IPVLAN_MODE_L2, NETDEV_IPVLAN_MODE_L3 = IPVLAN_MODE_L3, diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 9cfbb1171e..a8b4c8224c 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -4194,12 +4194,12 @@ int main(int argc, char *argv[]) { } if (arg_start_mode == START_BOOT) { - const char *p; + const char *p; - if (arg_pivot_root_new) - p = prefix_roota(arg_directory, arg_pivot_root_new); - else - p = arg_directory; + if (arg_pivot_root_new) + p = prefix_roota(arg_directory, arg_pivot_root_new); + else + p = arg_directory; if (path_is_os_tree(p) <= 0) { log_error("Directory %s doesn't look like an OS root directory (os-release file is missing). Refusing.", p); @@ -4209,10 +4209,10 @@ int main(int argc, char *argv[]) { } else { const char *p, *q; - if (arg_pivot_root_new) - p = prefix_roota(arg_directory, arg_pivot_root_new); - else - p = arg_directory; + if (arg_pivot_root_new) + p = prefix_roota(arg_directory, arg_pivot_root_new); + else + p = arg_directory; q = strjoina(p, "/usr/"); diff --git a/src/resolve/resolved-dns-dnssec.h b/src/resolve/resolved-dns-dnssec.h index c5714d9e0a..f2201b5d39 100644 --- a/src/resolve/resolved-dns-dnssec.h +++ b/src/resolve/resolved-dns-dnssec.h @@ -80,7 +80,6 @@ typedef enum DnssecNsecResult { int dnssec_nsec_test(DnsAnswer *answer, DnsResourceKey *key, DnssecNsecResult *result, bool *authenticated, uint32_t *ttl); - int dnssec_test_positive_wildcard(DnsAnswer *a, const char *name, const char *source, const char *zone, bool *authenticated); const char* dnssec_result_to_string(DnssecResult m) _const_; diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h index 12dc724b60..0ada5b012a 100644 --- a/src/resolve/resolved-dns-query.h +++ b/src/resolve/resolved-dns-query.h @@ -7,7 +7,6 @@ Copyright 2014 Lennart Poettering ***/ - #include "sd-bus.h" #include "set.h" diff --git a/src/resolve/resolved-dns-rr.h b/src/resolve/resolved-dns-rr.h index b7f011dbc6..d900d6744a 100644 --- a/src/resolve/resolved-dns-rr.h +++ b/src/resolve/resolved-dns-rr.h @@ -87,7 +87,6 @@ struct DnsResourceKey { ._name = (char*) n, \ }) - struct DnsTxtItem { size_t length; LIST_FIELDS(DnsTxtItem, items); diff --git a/src/shared/gpt.h b/src/shared/gpt.h index 70d77c160f..58e034e83c 100644 --- a/src/shared/gpt.h +++ b/src/shared/gpt.h @@ -33,7 +33,6 @@ #define GPT_ROOT_ARM_64_VERITY SD_ID128_MAKE(df,33,00,ce,d6,9f,4c,92,97,8c,9b,fb,0f,38,d8,20) #define GPT_ROOT_IA64_VERITY SD_ID128_MAKE(86,ed,10,d5,b6,07,45,bb,89,57,d3,50,f2,3d,05,71) - #if defined(__x86_64__) # define GPT_ROOT_NATIVE GPT_ROOT_X86_64 # define GPT_ROOT_SECONDARY GPT_ROOT_X86 diff --git a/src/shared/initreq.h b/src/shared/initreq.h index 710037d84b..9b19b5d729 100644 --- a/src/shared/initreq.h +++ b/src/shared/initreq.h @@ -55,7 +55,6 @@ struct init_request_bsd { char reserved[128]; /* For future expansion. */ }; - /* * Because of legacy interfaces, "runlevel" and "sleeptime" * aren't in a separate struct in the union. diff --git a/tools/find-double-newline.sh b/tools/find-double-newline.sh index c41811483c..6e7e4cb699 100755 --- a/tools/find-double-newline.sh +++ b/tools/find-double-newline.sh @@ -10,7 +10,7 @@ case "$1" in DIR="$2" fi - find $DIR -type f \( -name '*.c' -o -name '*.xml' \) -exec $0 diff \{\} \; + find $DIR -type f \( -name '*.[ch]' -o -name '*.xml' \) -exec $0 diff \{\} \; ;; recpatch) @@ -20,7 +20,7 @@ case "$1" in DIR="$2" fi - find $DIR -type f \( -name '*.c' -o -name '*.xml' \) -exec $0 patch \{\} \; + find $DIR -type f \( -name '*.[ch]' -o -name '*.xml' \) -exec $0 patch \{\} \; ;; diff) diff --git a/tools/find-tabs.sh b/tools/find-tabs.sh new file mode 100755 index 0000000000..611931c4b5 --- /dev/null +++ b/tools/find-tabs.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# SPDX-License-Identifier: LGPL-2.1+ + +case "$1" in + + recdiff) + if [ "$2" = "" ] ; then + DIR="$PWD/.." + else + DIR="$2" + fi + + find $DIR -type f \( -name '*.[ch]' -o -name '*.xml' \) -exec $0 diff \{\} \; + ;; + + recpatch) + if [ "$2" = "" ] ; then + DIR="$PWD/.." + else + DIR="$2" + fi + + find $DIR -type f \( -name '*.[ch]' -o -name '*.xml' \) -exec $0 patch \{\} \; + ;; + + diff) + T=`mktemp` + sed 's/\t/ /g' < "$2" > "$T" + diff -u "$2" "$T" + rm -f "$T" + ;; + + patch) + sed -i 's/\t/ /g' "$2" + ;; + + *) + echo "Expected recdiff|recpatch|diff|patch as verb." >&2 + ;; +esac