Re: Indentation mistake (was: Is TODO up-to-date?)

[Erik Auerswald]

Hi Simon,

On Thu, May 02, 2024 at 08:08:07PM +0200, Simon Josefsson wrote:
> tor 2024-05-02 klockan 20:05 +0200 skrev Erik Auerswald:
> > On Thu, May 02, 2024 at 07:55:23PM +0200, Simon Josefsson via Bug
> > reports for the GNU Internet utilities wrote:
> > > [...]
> > > I worry about self-tests though, it would be nice to beef up on
> > > that.
> > > There is a pretty substantial GNU/Linux-centric self-test pipeline
> > > here
> > > (I just noticed the last commit broke this due to indentation
> > > changes):
> > > 
> > > https://gitlab.com/gsasl/inetutils/-/pipelines
> > 
> > Sorry!
> > 
> > I did not notice a missing dependency during "make syntax-check":
> > 
> >     $ make syntax-check
> >     ...
> >     indent
> >     maint.mk: sc_indent: GNU indent is missing
> >     0.01 indent
> >     ...
> > 
> > Thus I did not see this problem.
> 
> Don't worry -- that's what the pipeline is there for, and it is easy to
> fix.  Could you run 'make indent' using a recent GNU indent and push
> the fix?

Sadly, I cannot do this, at least not easily.  After installing GNU
indent, "make syntax-check" complains about many files:

    $ indent --version
    GNU indent 2.2.12
    $ make syntax-check
    [...]
    immutable_NEWS
    0.01 immutable_NEWS
    indent
    --- ftp/ftp.c   2024-04-23 18:50:46.900620297 +0200
    +++ -   2024-05-02 20:11:16.996929412 +0200
    @@ -582,7 +582,7 @@
     }
     
     int
    -empty (fd_set *mask, int sec)
    +empty (fd_set * mask, int sec)
     {
       struct timeval t;
     
    [...]

But I can manually break the line as shown in
<https://gitlab.com/gsasl/inetutils/-/jobs/6731453789>:

    -     addr.s_addr = n ? htonl (INADDR_BROADCAST << (32 - n)) : INADDR_ANY;
    +     addr.s_addr =
    +       n ? htonl (INADDR_BROADCAST << (32 - n)) : INADDR_ANY;
          str = strdup (inet_ntoa (addr));

Do I need specific indent configuration for GNU Inetutils' "make
syntax-check"?  Or just a newer version?

Anyway, manually adding the line break and further indentation removes
"ifconfig" from the output of "make syntax-check", so I'll just push
that in a moment.

Best regards,
Erik