diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-24 19:40:02 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-25 08:49:16 -0400 |
commit | b884196cc1565eaf1b97141fbfa0667ee348e463 (patch) | |
tree | 9c61d74211ac9227af5ebc7061bd2f54ff4b200c /src | |
parent | dd6ab3df749172e0b85de00338b485d8f4e24fa1 (diff) |
meson: also indent scripts with 8 spaces
Diffstat (limited to 'src')
-rw-r--r-- | src/basic/af-to-name.awk | 10 | ||||
-rw-r--r-- | src/basic/arphrd-to-name.awk | 10 | ||||
-rw-r--r-- | src/basic/cap-to-name.awk | 10 | ||||
-rw-r--r-- | src/basic/errno-to-name.awk | 11 | ||||
-rwxr-xr-x | src/basic/generate-af-list.sh | 4 | ||||
-rwxr-xr-x | src/basic/generate-arphrd-list.sh | 4 | ||||
-rwxr-xr-x | src/basic/generate-cap-list.sh | 4 | ||||
-rwxr-xr-x | src/basic/generate-errno-list.sh | 2 | ||||
-rwxr-xr-x | src/boot/efi/no-undefined-symbols.sh | 4 | ||||
-rw-r--r-- | src/core/load-fragment-gperf-nulstr.awk | 14 | ||||
-rw-r--r-- | src/journal/audit_type-to-name.awk | 8 | ||||
-rwxr-xr-x | src/journal/generate-audit_type-list.sh | 8 | ||||
-rw-r--r-- | src/resolve/dns_type-to-name.awk | 14 | ||||
-rw-r--r-- | src/test/test-hashmap-ordered.awk | 14 | ||||
-rwxr-xr-x | src/udev/generate-keyboard-keys-list.sh | 2 |
15 files changed, 73 insertions, 46 deletions
diff --git a/src/basic/af-to-name.awk b/src/basic/af-to-name.awk index e20830487f..18d0a89728 100644 --- a/src/basic/af-to-name.awk +++ b/src/basic/af-to-name.awk @@ -1,5 +1,9 @@ -BEGIN{ print "static const char* const af_names[] = { "} +BEGIN{ + print "static const char* const af_names[] = { " +} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { - printf " [%s] = \"%s\",\n", $1, $1 + printf " [%s] = \"%s\",\n", $1, $1 +} +END{ + print "};" } -END{print "};"} diff --git a/src/basic/arphrd-to-name.awk b/src/basic/arphrd-to-name.awk index 57e4680f17..5a35673e2c 100644 --- a/src/basic/arphrd-to-name.awk +++ b/src/basic/arphrd-to-name.awk @@ -1,5 +1,9 @@ -BEGIN{ print "static const char* const arphrd_names[] = { "} +BEGIN{ + print "static const char* const arphrd_names[] = { " +} !/CISCO/ { - printf " [ARPHRD_%s] = \"%s\",\n", $1, $1 + printf " [ARPHRD_%s] = \"%s\",\n", $1, $1 +} +END{ + print "};" } -END{print "};"} diff --git a/src/basic/cap-to-name.awk b/src/basic/cap-to-name.awk index d252291851..402a782024 100644 --- a/src/basic/cap-to-name.awk +++ b/src/basic/cap-to-name.awk @@ -1,5 +1,9 @@ -BEGIN{ print "static const char* const capability_names[] = { "} +BEGIN{ + print "static const char* const capability_names[] = { " +} { - printf " [%s] = \"%s\",\n", $1, tolower($1) + printf " [%s] = \"%s\",\n", $1, tolower($1) +} +END{ + print "};" } -END{print "};"} diff --git a/src/basic/errno-to-name.awk b/src/basic/errno-to-name.awk index c48c8f93ab..0878abacbd 100644 --- a/src/basic/errno-to-name.awk +++ b/src/basic/errno-to-name.awk @@ -1,4 +1,9 @@ -BEGIN{ print "static const char* const errno_names[] = { " } +BEGIN{ + print "static const char* const errno_names[] = { " +} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { - printf " [%s] = \"%s\",\n", $1, $1 } -END{ print "};" } + printf " [%s] = \"%s\",\n", $1, $1 +} +END{ + print "};" +} diff --git a/src/basic/generate-af-list.sh b/src/basic/generate-af-list.sh index 733cf59dd0..8d9cdd1836 100755 --- a/src/basic/generate-af-list.sh +++ b/src/basic/generate-af-list.sh @@ -1,5 +1,5 @@ #!/bin/sh -eu $1 -E -dM -include sys/socket.h - </dev/null | \ - grep -Ev 'AF_UNSPEC|AF_MAX' | \ - awk '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $2; }' + grep -Ev 'AF_UNSPEC|AF_MAX' | \ + awk '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $2; }' diff --git a/src/basic/generate-arphrd-list.sh b/src/basic/generate-arphrd-list.sh index 3c2bc5483d..ee207fb38e 100755 --- a/src/basic/generate-arphrd-list.sh +++ b/src/basic/generate-arphrd-list.sh @@ -1,5 +1,5 @@ #!/bin/sh -eu $1 -dM -include net/if_arp.h - </dev/null | \ - awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \ - sed -e 's/ARPHRD_//' + awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \ + sed -e 's/ARPHRD_//' diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh index 3ac3544539..1d4a562e7c 100755 --- a/src/basic/generate-cap-list.sh +++ b/src/basic/generate-cap-list.sh @@ -1,5 +1,5 @@ #!/bin/sh -eu $1 -dM -include linux/capability.h -include "$2" -include "$3" - </dev/null | \ - awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \ - grep -v CAP_LAST_CAP + awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \ + grep -v CAP_LAST_CAP diff --git a/src/basic/generate-errno-list.sh b/src/basic/generate-errno-list.sh index a8b4938644..e2bab8b320 100755 --- a/src/basic/generate-errno-list.sh +++ b/src/basic/generate-errno-list.sh @@ -1,4 +1,4 @@ #!/bin/sh -eu $1 -dM -include errno.h - </dev/null | \ - awk '/^#define[ \t]+E[^ _]+[ \t]+/ { print $2; }' + awk '/^#define[ \t]+E[^ _]+[ \t]+/ { print $2; }' diff --git a/src/boot/efi/no-undefined-symbols.sh b/src/boot/efi/no-undefined-symbols.sh index 14a1a087bb..08b266c455 100755 --- a/src/boot/efi/no-undefined-symbols.sh +++ b/src/boot/efi/no-undefined-symbols.sh @@ -1,6 +1,6 @@ #!/bin/sh -eu if nm -D -u "$1" | grep ' U '; then - echo "Undefined symbols detected!" - exit 1 + echo "Undefined symbols detected!" + exit 1 fi diff --git a/src/core/load-fragment-gperf-nulstr.awk b/src/core/load-fragment-gperf-nulstr.awk index bc66ff221d..b52438abe3 100644 --- a/src/core/load-fragment-gperf-nulstr.awk +++ b/src/core/load-fragment-gperf-nulstr.awk @@ -1,12 +1,14 @@ BEGIN{ - keywords=0 ; FS="," ; - print "extern const char load_fragment_gperf_nulstr[];" ; - print "const char load_fragment_gperf_nulstr[] =" + keywords=0 ; FS="," ; + print "extern const char load_fragment_gperf_nulstr[];" ; + print "const char load_fragment_gperf_nulstr[] =" } keyword==1 { - print "\"" $$1 "\\0\"" + print "\"" $$1 "\\0\"" } /%%/ { - keyword=1 + keyword=1 +} +END { + print ";" } -END { print ";" } diff --git a/src/journal/audit_type-to-name.awk b/src/journal/audit_type-to-name.awk index 38a4b05321..44fc702eb3 100644 --- a/src/journal/audit_type-to-name.awk +++ b/src/journal/audit_type-to-name.awk @@ -1,5 +1,9 @@ -BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } +BEGIN{ + print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" +} { printf " case AUDIT_%s: return \"%s\";\n", $1, $1 } -END{ print " default: return NULL;\n\t}\n}\n" } +END{ + print " default: return NULL;\n\t}\n}\n" +} diff --git a/src/journal/generate-audit_type-list.sh b/src/journal/generate-audit_type-list.sh index c9476b7809..18cbe0599c 100755 --- a/src/journal/generate-audit_type-list.sh +++ b/src/journal/generate-audit_type-list.sh @@ -5,10 +5,10 @@ shift includes="" for i in "$@"; do - includes="$includes -include $i" + includes="$includes -include $i" done $cpp -dM $includes - </dev/null | \ - grep -vE 'AUDIT_.*(FIRST|LAST)_' | \ - sed -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | \ - sort -k2 + grep -vE 'AUDIT_.*(FIRST|LAST)_' | \ + sed -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | \ + sort -k2 diff --git a/src/resolve/dns_type-to-name.awk b/src/resolve/dns_type-to-name.awk index 64d675b0a9..badb1824b5 100644 --- a/src/resolve/dns_type-to-name.awk +++ b/src/resolve/dns_type-to-name.awk @@ -1,7 +1,11 @@ -BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } +BEGIN{ + print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" +} { - printf " case DNS_TYPE_%s: return ", $1; - sub(/_/, "-"); - printf "\"%s\";\n", $1 + printf " case DNS_TYPE_%s: return ", $1; + sub(/_/, "-"); + printf "\"%s\";\n", $1 +} +END{ + print " default: return NULL;\n\t}\n}\n" } -END{ print " default: return NULL;\n\t}\n}\n" } diff --git a/src/test/test-hashmap-ordered.awk b/src/test/test-hashmap-ordered.awk index 4e75a4655a..10f4386fa4 100644 --- a/src/test/test-hashmap-ordered.awk +++ b/src/test/test-hashmap-ordered.awk @@ -1,11 +1,11 @@ BEGIN { - print "/* GENERATED FILE */"; - print "#define ORDERED" + print "/* GENERATED FILE */"; + print "#define ORDERED" } { - if (!match($0, "^#include")) - gsub(/hashmap/, "ordered_hashmap"); - gsub(/HASHMAP/, "ORDERED_HASHMAP"); - gsub(/Hashmap/, "OrderedHashmap"); - print + if (!match($0, "^#include")) + gsub(/hashmap/, "ordered_hashmap"); + gsub(/HASHMAP/, "ORDERED_HASHMAP"); + gsub(/Hashmap/, "OrderedHashmap"); + print } diff --git a/src/udev/generate-keyboard-keys-list.sh b/src/udev/generate-keyboard-keys-list.sh index 5fb5ed0bbe..479e493182 100755 --- a/src/udev/generate-keyboard-keys-list.sh +++ b/src/udev/generate-keyboard-keys-list.sh @@ -1,4 +1,4 @@ #!/bin/sh -eu $1 -dM -include linux/input.h - </dev/null | \ - awk '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($2 != "KEY_MAX") { print $2 } }' + awk '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($2 != "KEY_MAX") { print $2 } }' |