package/inotify-tools/0001-gcc6.patch

   1 From 5fe3ba82134d8b85adc69cf1d6c5742b4bde20b4 Mon Sep 17 00:00:00 2001
   2 From: James Knight <james.d.knight@live.com>
   3 Date: Thu, 16 Jun 2016 00:00:57 -0400
   4 Subject: [PATCH] correct code alignment
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 The following replaces the indented section of code from spaces to tabs.
  10 No functional changes. Aside from consistency, this resolves a GCC 6
  11 build issue with the flag `-Werror=misleading-indentation` enabled:
  12
  13     inotifywait.c: In function ‘output_event_csv’:
  14     inotifywait.c:126:5: error: this ‘if’ clause does not guard...
  15                                 [-Werror=misleading-indentation]
  16          if (filename != NULL)
  17          ^~
  18     inotifywait.c:129:2: note: ...this statement, but the latter is
  19                                misleadingly indented as if it is guarded
  20                                by the ‘if’
  21       printf("%s,", csv_escape( inotifytools_event_to_str( event->mask )
  22                                                                     ) );
  23       ^~~~~~
  24
  25 Signed-off-by: James Knight <james.d.knight@live.com>
  26 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  27 (downloaded from upstream pull request
  28  https://github.com/rvoicilas/inotify-tools/pull/65)
  29 ---
  30  src/inotifywait.c | 6 +++---
  31  1 file changed, 3 insertions(+), 3 deletions(-)
  32
  33 diff --git a/src/inotifywait.c b/src/inotifywait.c
  34 index c5ce5e3..404a85b 100644
  35 --- a/src/inotifywait.c
  36 +++ b/src/inotifywait.c
  37 @@ -122,9 +122,9 @@ void validate_format( char * fmt ) {
  38
  39
  40  void output_event_csv( struct inotify_event * event ) {
  41 -    char *filename = csv_escape(inotifytools_filename_from_wd(event->wd));
  42 -    if (filename != NULL)
  43 -        printf("%s,", filename);
  44 +       char *filename = csv_escape(inotifytools_filename_from_wd(event->wd));
  45 +       if (filename != NULL)
  46 +               printf("%s,", filename);
  47
  48         printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) );
  49         if ( event->len > 0 )