From: Zbigniew Jędrzejewski-Szmek Date: Thu, 7 Jun 2018 13:08:02 +0000 (+0200) Subject: CODING_STYLE: allow c99-style mixed code and declarations X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3d6b013798a625b59c0cdf08dc7dde6b3bef3998;p=elogind.git CODING_STYLE: allow c99-style mixed code and declarations We already allowed variables to be declared in the middle of a function (whenever a new scope was opened), so this isn't such a big change. Sometimes we would open a scope just to work around this prohibition. But sometimes the code can be much clearer if the variable is declared somewhere in the middle of a scope, in particular if the declaration is combined with initialization or acquisition of some resources. So let's allow this, but keep things in the old style, unless there's a good reason to move the variable declaration to a different place. --- diff --git a/meson.build b/meson.build index c226dfaed..1356ae996 100644 --- a/meson.build +++ b/meson.build @@ -369,7 +369,6 @@ endif # '-Wold-style-definition', # '-Wpointer-arith', # '-Winit-self', -# '-Wdeclaration-after-statement', # '-Wfloat-equal', # '-Wsuggest-attribute=noreturn', # '-Werror=missing-prototypes', @@ -435,7 +434,7 @@ endif add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'c') # "negative" arguments: gcc on purpose does not return an error for "-Wno-" -# arguments, just emits a warnings. So test for the "positive" version instead. +# arguments, just emits a warning. So test for the "positive" version instead. foreach arg : ['unused-parameter', 'missing-field-initializers', 'unused-result', @@ -1927,6 +1926,7 @@ executable('elogind-user-runtime-dir', executable('elogind-user-runtime-dir', executable('elogind-user-runtime-dir', executable('elogind-user-runtime-dir', +executable('elogind-user-runtime-dir', executable('elogind-user-runtime-dir', user_runtime_dir_sources, include_directories : includes,