shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

Merge pull request #9065 from poettering/fixup-tab-double-newline

Browse Source 
tree-wide: fix some TABs and double newlines
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-05-22 17:14:48 +02:00 committed by GitHub
commit 14d0afb94d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 64 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
man/systemd-ask-password.xml
View File

@ -196,10 +196,10 @@
<varlistentry>
<term><option>--no-output</option></term>
<listitem><para>Do not print passwords to standard output.
This is useful if you want to store a password in kernel
keyring with <option>--keyname</option> but do not want it
to show up on screen or in logs.</para></listitem>
<listitem><para>Do not print passwords to standard output.
This is useful if you want to store a password in kernel
keyring with <option>--keyname</option> but do not want it
to show up on screen or in logs.</para></listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="help" />

4
man/systemd-cgtop.xml
View File

@ -146,8 +146,8 @@
<term><option>-r</option></term>
<term><option>--raw</option></term>
<listitem><para>Format byte counts (as in memory usage and I/O metrics)
with raw numeric values rather than human-readable
<listitem><para>Format byte counts (as in memory usage and I/O metrics)
with raw numeric values rather than human-readable
numbers.</para></listitem>
</varlistentry>

10
man/udevadm.xml
View File

@ -298,11 +298,11 @@
<term><option>-y</option></term>
<term><option>--sysname-match=<replaceable>PATH</replaceable></option></term>
<listitem>
<para>Trigger events for devices for which the last component
(i.e. the filename) of the <filename>/sys</filename> path matches
the specified <replaceable>PATH</replaceable>. This option can be
specified multiple times and also supports shell style pattern
matching.</para>
<para>Trigger events for devices for which the last component
(i.e. the filename) of the <filename>/sys</filename> path matches
the specified <replaceable>PATH</replaceable>. This option can be
specified multiple times and also supports shell style pattern
matching.</para>
</listitem>
</varlistentry>
<varlistentry>

2
src/basic/MurmurHash2.c
View File

@ -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)

2
src/basic/MurmurHash2.h
View File

@ -18,7 +18,7 @@ typedef unsigned __int64 uint64_t;
// Other compilers
#else // defined(_MSC_VER)
#else // defined(_MSC_VER)
#include <stdint.h>

1
src/basic/mempool.h
View File

@ -29,7 +29,6 @@ static struct mempool pool_name = { \
.at_least = alloc_at_least, \
}
#if VALGRIND
void mempool_drop(struct mempool *mp);
#endif

1
src/basic/missing.h
View File

@ -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];

1
src/basic/missing_syscall.h
View File

@ -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

1
src/basic/string-table.h
View File

@ -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)

1
src/basic/strxcpyx.h
View File

@ -7,7 +7,6 @@
Copyright 2013 Kay Sievers
***/
#include <stddef.h>
#include "macro.h"

1
src/core/dbus-automount.h
View File

@ -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);

1
src/libsystemd/sd-netlink/local-addresses.h
View File

@ -7,7 +7,6 @@
Copyright 2008-2011 Lennart Poettering
***/
#include "sd-netlink.h"
#include "in-addr-util.h"

1
src/libudev/libudev.h
View File

@ -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

1
src/login/logind-inhibit.h
View File

@ -9,7 +9,6 @@
typedef struct Inhibitor Inhibitor;
typedef enum InhibitWhat {
INHIBIT_SHUTDOWN = 1,
INHIBIT_SLEEP = 2,

1
src/network/netdev/ipvlan.h
View File

@ -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,

18
src/nspawn/nspawn.c
View File

@ -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/");

1
src/resolve/resolved-dns-dnssec.h
View File

@ -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_;

1
src/resolve/resolved-dns-query.h
View File

@ -7,7 +7,6 @@
Copyright 2014 Lennart Poettering
***/
#include "sd-bus.h"
#include "set.h"

1
src/resolve/resolved-dns-rr.h
View File

@ -87,7 +87,6 @@ struct DnsResourceKey {
._name = (char*) n, \
})
struct DnsTxtItem {
size_t length;
LIST_FIELDS(DnsTxtItem, items);

1
src/shared/gpt.h
View File

@ -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

1
src/shared/initreq.h
View File

@ -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.

4
tools/find-double-newline.sh
View File

@ -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)

40
tools/find-tabs.sh Executable file
View File

@ -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