Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Jun 2018 19:51:53 -0700
From:      Juli Mallett <juli@northcloak.com>
To:        rgrimes@freebsd.org
Cc:        Eitan Adler <eadler@freebsd.org>, src-committers <src-committers@freebsd.org>,  svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: svn commit: r335270 - head/lib/liby
Message-ID:  <CAGSiXYxoxWGRCE=%2BqX9unoycR01idWbo7Zq31u8PYSt4h7LmmA@mail.gmail.com>
In-Reply-To: <201806170243.w5H2haP5058197@pdx.rh.CN85.dnsmgr.net>
References:  <CAF6rxgmmN67HYz%2B6ySdLq2q0YfcrjRYXeRePnYhGH9hXZSE_ww@mail.gmail.com> <201806170243.w5H2haP5058197@pdx.rh.CN85.dnsmgr.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On 16 June 2018 at 19:43, Rodney W. Grimes <freebsd@pdx.rh.cn85.dnsmgr.net>
wrote:

> > On 16 June 2018 at 18:10, Rodney W. Grimes
> > <freebsd@pdx.rh.cn85.dnsmgr.net> wrote:
> > > [ Charset UTF-8 unsupported, converting... ]
> > >> Author: eadler
> > >> Date: Sat Jun 16 23:50:34 2018
> > >> New Revision: 335270
> > >> URL: https://svnweb.freebsd.org/changeset/base/335270
> > >>
> > >> Log:
> > >>   liby: build with WARNS=6
> > >>
> > >>   Tested with amd64, arm64, i386, mips
> > >>
> > >> Added:
> > >>   head/lib/liby/yyerror.h   (contents, props changed)
> > >> Modified:
> > >>   head/lib/liby/Makefile
> > >>   head/lib/liby/main.c
> > >>   head/lib/liby/yyerror.c
> > >>
> > >> Modified: head/lib/liby/Makefile
> > >> ============================================================
> ==================
> > >> --- head/lib/liby/Makefile    Sat Jun 16 23:49:22 2018
> (r335269)
> > >> +++ head/lib/liby/Makefile    Sat Jun 16 23:50:34 2018
> (r335270)
> > >> @@ -5,6 +5,4 @@ LIB=  y
> > >>  SRCS=        main.c yyerror.c
> > >>  NO_PIC=
> > >>
> > >> -WARNS?=      1
> > >> -
> > >>  .include <bsd.lib.mk>
> > >>
> > >> Modified: head/lib/liby/main.c
> > >> ============================================================
> ==================
> > >> --- head/lib/liby/main.c      Sat Jun 16 23:49:22 2018
> (r335269)
> > >> +++ head/lib/liby/main.c      Sat Jun 16 23:50:34 2018
> (r335270)
> > >> @@ -32,16 +32,17 @@
> > >>  #include <sys/cdefs.h>
> > >>  __FBSDID("$FreeBSD$");
> > >>
> > >> -#ifndef lint
> > >> +#if defined(LIBC_SCCS) && !defined(lint)
> > >>  static char sccsid[] = "@(#)main.c   8.1 (Berkeley) 6/4/93";
> > >> -#endif /* not lint */
> > >> +#endif /* LIBC_SCCS and not lint */
> > >>
> > >>  #include <stdlib.h>
> > >>
> > >> -int yyparse(void);
> > >> +#include "yyerror.h"
> > >>
> > >>  int
> > >>  main(void)
> > >>  {
> > >> +
> > >>       exit(yyparse());
> > >>  }
> > >>
> > >> Modified: head/lib/liby/yyerror.c
> > >> ============================================================
> ==================
> > >> --- head/lib/liby/yyerror.c   Sat Jun 16 23:49:22 2018
> (r335269)
> > >> +++ head/lib/liby/yyerror.c   Sat Jun 16 23:50:34 2018
> (r335270)
> > >> @@ -32,16 +32,18 @@
> > >>  #include <sys/cdefs.h>
> > >>  __FBSDID("$FreeBSD$");
> > >>
> > >> -#ifndef lint
> > >> +#if defined(LIBC_SCCS) && !defined(lint)
> > >>  static char sccsid[] = "@(#)yyerror.c        8.1 (Berkeley) 6/4/93";
> > >> -#endif /* not lint */
> > >> +#endif /* LIBC_SCCS and not lint */
> > >>
> > >>  #include <stdio.h>
> > >>
> > >> +#include "yyerror.h"
> > >> +
> > >>  int
> > >> -yyerror(msg)
> > >> -char *msg;
> > >> +yyerror(const char *msg)
> > >>  {
> > >> -     (void)fprintf(stderr, "%s\n", msg);
> > >> +
> > >> +     fprintf(stderr, "%s\n", msg);
> > >>       return(0);
> > >>  }
> > >>
> > >> Added: head/lib/liby/yyerror.h
> > >> ============================================================
> ==================
> > >> --- /dev/null 00:00:00 1970   (empty, because file is newly added)
> > >> +++ head/lib/liby/yyerror.h   Sat Jun 16 23:50:34 2018
> (r335270)
> > >> @@ -0,0 +1,36 @@
> > >
> > > Where did this file come from????
> >
> > I added a header file instead of keeping the prototypes in the .c
> > files. Is something wrong with that?
>
> If you extracted part of a c file and placed it in a .h file, you
> should add a
>  * from:        pathname
> comment to this yyerror.h
>

Rod,

It's two prototypes.  For functions that are extern.  Including the UCB
copyright isn't even necessary, but seems reasonable.

No, people do not need to add "from:" notes when adding a header to provide
prototypes for extern functions.

Juli.


> What flagged me was we shouldnt just have spontanious files arriving
> from 1990/1993 UCB.
>
> Thanks,
> Rod
>
> @@ -0,0 +1,36 @@
> +/*-
> + * SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright (c) 1990, 1993
> + *     The Regents of the University of California.  All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
>
> --
> Rod Grimes
> rgrimes@freebsd.org
>
>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGSiXYxoxWGRCE=%2BqX9unoycR01idWbo7Zq31u8PYSt4h7LmmA>