Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame^] | 1 | From 7affb288d6c0726e7b1ebc317a878927b6ef0d02 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrea Galbusera <gizero@gmail.com> |
| 3 | Date: Tue, 13 Sep 2016 08:10:29 +0200 |
| 4 | Subject: [PATCH] inotifywait: fix compile error with GCC 6 |
| 5 | |
| 6 | Fails to compile with misleading-indentation error |
| 7 | |
| 8 | | src/inotifywait.c: In function 'output_event_csv': |
| 9 | | src/inotifywait.c:126:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation] |
| 10 | | if (filename != NULL) |
| 11 | | ^~ |
| 12 | | src/inotifywait.c:129:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' |
| 13 | | printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) ); |
| 14 | | ^~~~~~ |
| 15 | | cc1: all warnings being treated as errors |
| 16 | |
| 17 | Fix indentation to resolve. |
| 18 | |
| 19 | Upstream-Status: Submitted [https://github.com/rvoicilas/inotify-tools/pull/66] |
| 20 | |
| 21 | Signed-off-by: Andrea Galbusera <gizero@gmail.com> |
| 22 | --- |
| 23 | src/inotifywait.c | 6 +++--- |
| 24 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 25 | |
| 26 | diff --git a/src/inotifywait.c b/src/inotifywait.c |
| 27 | index c5ce5e3..404a85b 100644 |
| 28 | --- a/src/inotifywait.c |
| 29 | +++ b/src/inotifywait.c |
| 30 | @@ -122,9 +122,9 @@ void validate_format( char * fmt ) { |
| 31 | |
| 32 | |
| 33 | void output_event_csv( struct inotify_event * event ) { |
| 34 | - char *filename = csv_escape(inotifytools_filename_from_wd(event->wd)); |
| 35 | - if (filename != NULL) |
| 36 | - printf("%s,", filename); |
| 37 | + char *filename = csv_escape(inotifytools_filename_from_wd(event->wd)); |
| 38 | + if (filename != NULL) |
| 39 | + printf("%s,", filename); |
| 40 | |
| 41 | printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) ); |
| 42 | if ( event->len > 0 ) |
| 43 | -- |
| 44 | 1.9.1 |
| 45 | |