diff options
author | cwt <cwt@FreeBSD.org> | 1997-12-15 23:23:35 +0000 |
---|---|---|
committer | cwt <cwt@FreeBSD.org> | 1997-12-15 23:23:35 +0000 |
commit | 7cb55de6f5fe34cf96591b368ea2596664c34a99 (patch) | |
tree | 6c996d5a5ed8fb0c736ab166bbf0422f729a3acc /contrib/global/btreeop | |
parent | 4fda3be4508d5e4d5cebf2deac98f970dba97f16 (diff) | |
download | FreeBSD-src-7cb55de6f5fe34cf96591b368ea2596664c34a99.zip FreeBSD-src-7cb55de6f5fe34cf96591b368ea2596664c34a99.tar.gz |
Resolve -Wall issues and be stylistic about #include directives.
Diffstat (limited to 'contrib/global/btreeop')
-rw-r--r-- | contrib/global/btreeop/btreeop.c | 10 | ||||
-rw-r--r-- | contrib/global/btreeop/err.c | 217 |
2 files changed, 8 insertions, 219 deletions
diff --git a/contrib/global/btreeop/btreeop.c b/contrib/global/btreeop/btreeop.c index b82ff58..18160fb 100644 --- a/contrib/global/btreeop/btreeop.c +++ b/contrib/global/btreeop/btreeop.c @@ -32,7 +32,13 @@ * */ #include <sys/stat.h> + +#include <ctype.h> #include <signal.h> +#include <stdlib.h> +#include <string.h> + +#include "dbio.h" #include "global.h" char *dbdefault = "btree"; /* default database name */ @@ -87,7 +93,7 @@ char *argv[]; { char command = 'R'; char *key = NULL; - int mode; + int mode = 0; char *dbname; DBIO *dbio; int i, c; @@ -188,7 +194,7 @@ DBIO *dbio; * +------------------ * | __.VERSION 2 */ - while (p = mgets(stdin, 0, NULL)) { + while ((p = mgets(stdin, 0, NULL)) != NULL) { if (exitflag) break; c = p; diff --git a/contrib/global/btreeop/err.c b/contrib/global/btreeop/err.c deleted file mode 100644 index bd84d46..0000000 --- a/contrib/global/btreeop/err.c +++ /dev/null @@ -1,217 +0,0 @@ -/*- - * Copyright (c) 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. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ - -#include <err.h> -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#ifdef __STDC__ -#include <stdarg.h> -#else -#include <varargs.h> -#endif - -/* extern char *__progname; Program name, from crt0. */ -char *progname = "btreeop"; - -static FILE *err_file; /* file to use for error output */ -static void (*err_exit)(int); - -void -err_set_file(void *fp) -{ - if (fp) - err_file = fp; - else - err_file = stderr; -} - -void -err_set_exit(void (*ef)(int)) -{ - err_exit = ef; -} - -void -#ifdef __STDC__ -err(int eval, const char *fmt, ...) -#else -err(eval, fmt, va_alist) - int eval; - const char *fmt; - va_dcl -#endif -{ - va_list ap; -#if __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif - verr(eval, fmt, ap); - va_end(ap); -} - -void -verr(eval, fmt, ap) - int eval; - const char *fmt; - va_list ap; -{ - int sverrno; - - sverrno = errno; - if (! err_file) - err_set_file((FILE *)0); - (void)fprintf(err_file, "%s: ", progname); - if (fmt != NULL) { - (void)vfprintf(err_file, fmt, ap); - (void)fprintf(err_file, ": "); - } - (void)fprintf(err_file, "%s\n", strerror(sverrno)); - if(err_exit) - err_exit(eval); - exit(eval); -} - -void -#if __STDC__ -errx(int eval, const char *fmt, ...) -#else -errx(eval, fmt, va_alist) - int eval; - const char *fmt; - va_dcl -#endif -{ - va_list ap; -#if __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif - verrx(eval, fmt, ap); - va_end(ap); -} - -void -verrx(eval, fmt, ap) - int eval; - const char *fmt; - va_list ap; -{ - if (! err_file) - err_set_file((FILE *)0); - (void)fprintf(err_file, "%s: ", progname); - if (fmt != NULL) - (void)vfprintf(err_file, fmt, ap); - (void)fprintf(err_file, "\n"); - if (err_exit) - err_exit(eval); - exit(eval); -} - -void -#if __STDC__ -warn(const char *fmt, ...) -#else -warn(fmt, va_alist) - const char *fmt; - va_dcl -#endif -{ - va_list ap; -#if __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif - vwarn(fmt, ap); - va_end(ap); -} - -void -vwarn(fmt, ap) - const char *fmt; - va_list ap; -{ - int sverrno; - - sverrno = errno; - if (! err_file) - err_set_file((FILE *)0); - (void)fprintf(err_file, "%s: ", progname); - if (fmt != NULL) { - (void)vfprintf(err_file, fmt, ap); - (void)fprintf(err_file, ": "); - } - (void)fprintf(err_file, "%s\n", strerror(sverrno)); -} - -void -#ifdef __STDC__ -warnx(const char *fmt, ...) -#else -warnx(fmt, va_alist) - const char *fmt; - va_dcl -#endif -{ - va_list ap; -#ifdef __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif - vwarnx(fmt, ap); - va_end(ap); -} - -void -vwarnx(fmt, ap) - const char *fmt; - va_list ap; -{ - if (! err_file) - err_set_file((FILE *)0); - (void)fprintf(err_file, "%s: ", progname); - if (fmt != NULL) - (void)vfprintf(err_file, fmt, ap); - (void)fprintf(err_file, "\n"); -} |