diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 11:47:03 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 12:15:20 +0000 |
| commit | dc6a5ddcc684018fd822271b1ee20e5b49d80a24 (patch) | |
| tree | 716dc279cf71e62b91a9534b43702160bcb15628 /tools | |
| parent | b2094fece93d4cd9c32a8504f9c34bfc70660b3a (diff) | |
| download | telepathy-salut-dc6a5ddcc684018fd822271b1ee20e5b49d80a24.tar.gz | |
Update coding style check stuff from telepathy-glib
This removes --enable-coding-style-checks in favour of the more general
--enable-fatal-warnings, which also controls use of -Werror (although for
-Werror it can be overridden with --enable-Werror).
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/check-c-style.sh | 7 | ||||
| -rw-r--r-- | tools/check-coding-style.mk | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/tools/check-c-style.sh b/tools/check-c-style.sh index 4330b147..55834207 100644 --- a/tools/check-c-style.sh +++ b/tools/check-c-style.sh @@ -3,13 +3,6 @@ fail=0 ( . "${tools_dir}"/check-misc.sh ) || fail=$? -if grep -n '^ *GError *\*[[:alpha:]_][[:alnum:]_]* *;' "$@" -then - echo "^^^ The above files contain uninitialized GError*s - they should be" - echo " initialized to NULL" - fail=1 -fi - # The first regex finds function calls like foo() (as opposed to foo ()). # It attempts to ignore string constants (may cause false negatives). # The second and third ignore block comments (gtkdoc uses foo() as markup). diff --git a/tools/check-coding-style.mk b/tools/check-coding-style.mk index 1c0a60f6..f3f74fa4 100644 --- a/tools/check-coding-style.mk +++ b/tools/check-coding-style.mk @@ -10,7 +10,7 @@ check-coding-style: sh $(top_srcdir)/tools/check-c-style.sh \ $(addprefix $(srcdir)/,$(check_c_sources)) || fail=1; \ fi;\ - if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \ + if test yes = "$(enable_fatal_warnings)"; then \ exit "$$fail";\ else \ exit 0;\ |