d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WARNS=2 fix, add externs.h to centralise external prototypes,

Browse Source 
use __FBSDID(), kill register keyword.
This commit is contained in:
Mark Murray 2001-12-11 23:02:44 +00:00
parent d6bf632706
commit 89886a7e99
3 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
usr.bin/vis/extern.h Normal file
View File

@ -0,0 +1,36 @@
/*-
* Copyright (c) 1989, 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:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
extern int foldit __P((char *, int, int));

14
usr.bin/vis/foldit.c
View File

@ -31,22 +31,24 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#ifndef lint #ifndef lint
#if 0 static const char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93";
static char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93";
#endif #endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#include <stdio.h> #include <stdio.h>
#include "extern.h"
int int
foldit(chunk, col, max) foldit(chunk, col, max)
char *chunk; char *chunk;
int col, max; int col, max;
{ {
register char *cp; char *cp;
/* /*
* Keep track of column position. Insert hidden newline * Keep track of column position. Insert hidden newline

15
usr.bin/vis/vis.c
View File

@ -31,19 +31,19 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#ifndef lint #ifndef lint
static const char copyright[] = static const char copyright[] =
"@(#) Copyright (c) 1989, 1993\n\ "@(#) Copyright (c) 1989, 1993\n\
The Regents of the University of California. All rights reserved.\n"; The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */ #endif
#ifndef lint #ifndef lint
#if 0 static const char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93";
static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93";
#endif #endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#include <err.h> #include <err.h>
#include <locale.h> #include <locale.h>
@ -52,11 +52,12 @@ static const char rcsid[] =
#include <unistd.h> #include <unistd.h>
#include <vis.h> #include <vis.h>
#include "extern.h"
int eflags, fold, foldwidth=80, none, markeol, debug; int eflags, fold, foldwidth=80, none, markeol, debug;
void process __P((FILE *)); void process __P((FILE *));
static void usage __P((void)); static void usage __P((void));
extern int foldit __P((char *, int, int));
int int
main(argc, argv) main(argc, argv)