]> granicus.if.org Git - graphviz/commitdiff
sfio: correct misleading indentation in REINIT 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:114:25: error: this ‘for’ clause does not guard... [-Werror=misleading-indentation]
  114 |                 {       for(d = f->disc; d && !d->iof; d = d->disc) ; \
      |                         ^~~
../lib/sfio/sfdisc.c:119:9: note: in expansion of macro ‘REINIT’
  119 |         REINIT(oreadf, readf, Sfread_f);
      |         ^~~~~~
../lib/sfio/sfdisc.c:115:25: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘for’
  115 |                         if(DISCF(d,iof,type) != oiof) \
      |                         ^~
../lib/sfio/sfdisc.c:119:9: note: in expansion of macro ‘REINIT’
  119 |         REINIT(oreadf, readf, Sfread_f);
      |         ^~~~~~

lib/sfio/sfdisc.c

index 786cf662ffb2ac38fb7abaa33f214c946956319d..ac932a9599bbea2201866c04040b6f563b8880dd 100644 (file)
@@ -112,7 +112,8 @@ Sfdisc_t *sfdisc(Sfio_t * f, Sfdisc_t * disc)
 #define DISCF(dst,iof,type)    (dst ? dst->iof : NULL)
 #define REINIT(oiof,iof,type) \
                if(!reinit) \
-               {       for(d = f->disc; d && !d->iof; d = d->disc) ; \
+               {       for(d = f->disc; d && !d->iof; d = d->disc) \
+                               ; \
                        if(DISCF(d,iof,type) != oiof) \
                                reinit = 1; \
                }