[PATCH 4/7] Protect 'i' in |_handle_inotify_watch| by DBUS_ENABLE_VERBOSE_MODE

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Aug 10 10:31:21 UTC 2016

On 09/08/16 20:18, Thomas Zimmermann wrote:
> -  while (i < ret)
> -    {
> -      struct inotify_event *ev;
> +  {
> +    int i = 0;

This is a pretty huge diffstat because you've re-indented everything.
I'd prefer to either wrap a separate #ifdef DBUS_ENABLE_VERBOSE_MODE
around the existing declaration of i, or make disabled verbose mode add
"unused-variable" to DISABLE_UNUSED_WARNINGS in configure.ac (look for
"test x$enable_checks = xno" at around line 321).

Any time a trivial fix causes a non-trivial diff, IMO it's worth
considering whether the fix is worth the diff.

Simon McVittie
Collabora Ltd. <http://www.collabora.com/>

More information about the dbus mailing list