On Wed, Jul 16, 2014 at 03:19:00PM +0300, Konstantin Belousov wrote: G > On Wed, Jul 16, 2014 at 11:41:28AM +0000, Baptiste Daroussin wrote: > > Author: bapt > > Date: Wed Jul 16 11:41:28 2014 > > New Revision: 268750 > > URL: http://svnweb.freebsd.org/changeset/base/268750 > > > > Log: > > Sort headers > > Constify long options > > Remove useless call to sigemptyset > > properly check errno when waiting for a process status when a SIGCHLD is > > received > > > > Modified: > > head/usr.bin/timeout/timeout.c > > > > Modified: head/usr.bin/timeout/timeout.c > > ============================================================================== > > --- head/usr.bin/timeout/timeout.c Wed Jul 16 11:30:04 2014 > > (r268749) > > +++ head/usr.bin/timeout/timeout.c Wed Jul 16 11:41:28 2014 > > (r268750) > > @@ -28,20 +28,18 @@ > > #include <sys/cdefs.h> > > __FBSDID("$FreeBSD$"); > > > > -#include <sys/types.h> > > -#include <sys/time.h> > > -#include <sys/wait.h> > > +#include <err.h> > > +#include <errno.h> > > +#include <getopt.h> > > #include <signal.h> > > +#include <stdbool.h> > > #include <stdio.h> > > #include <stdlib.h> > > #include <string.h> > > +#include <sys/time.h> > > +#include <sys/wait.h> > > #include <sysexits.h> > > #include <unistd.h> > > -#include <getopt.h> > > -#include <err.h> > > -#include <spawn.h> > > -#include <errno.h> > > -#include <stdbool.h> > This is not proper sorting. sys/*.h comes first, usermode headers > second. > > > > #define EXIT_TIMEOUT 124 > > > > @@ -188,7 +186,7 @@ main(int argc, char **argv) > > cpid = -1; > > pgid = -1; > > > > - struct option longopts[] = { > > + const struct option longopts[] = { > I noted that this should be static const, not just const.
static const is just not working here. because of the 2 first entries. > > The curious tendency of late is people committing changes without > getting final confirmation from reviewer. Asking to look at the patch > before commit would avoid repo churn. Maybe because the code is sitting on code reviews for a while and that I adressed all the issue commented there regards, Bapt
pgpE0s61vq2vN.pgp
Description: PGP signature