]> granicus.if.org Git - graphviz/commitdiff
sfio: correct misleading indentation in GETDISCF macro definition
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Tue, 19 Oct 2021 05:15:02 +0000 (07:15 +0200)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Thu, 21 Oct 2021 20:58:32 +0000 (22:58 +0200)
Fixes errors like this when building with CMake (which uses -Wall,
-Wextra and -Werror) on Ubuntu 21.10 with gcc 11.2.0.

../lib/sfio/sfdisc.c:68:11: error: this ‘for’ clause does not guard... [-Werror=misleading-indentation]
   68 |         { for(d = f->disc; d && !d->iof; d = d->disc) ; \
      |           ^~~
../lib/sfio/sfdisc.c:71:5: note: in expansion of macro ‘GETDISCF’
   71 |     GETDISCF(oreadf, readf, Sfread_f);
      |     ^~~~~~~~
../lib/sfio/sfdisc.c:71:14: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘for’
   71 |     GETDISCF(oreadf, readf, Sfread_f);
      |              ^~~~~~
../lib/sfio/sfdisc.c:69:11: note: in definition of macro ‘GETDISCF’
   69 |           func = d ? d->iof : NULL; \
      |           ^~~~

lib/sfio/sfdisc.c

index 26b3f76534bfca9b13a294a215a3f504b757294c..786cf662ffb2ac38fb7abaa33f214c946956319d 100644 (file)
@@ -65,7 +65,8 @@ Sfdisc_t *sfdisc(Sfio_t * f, Sfdisc_t * disc)
 
     /* save old readf, writef, and seekf to see if stream need reinit */
 #define GETDISCF(func,iof,type) \
-       { for(d = f->disc; d && !d->iof; d = d->disc) ; \
+       { for(d = f->disc; d && !d->iof; d = d->disc) \
+             ; \
          func = d ? d->iof : NULL; \
        }
     GETDISCF(oreadf, readf, Sfread_f);