summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2005-12-19 18:21:32 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2005-12-19 18:21:32 +0000
commit0cc21af9b045966354c2a9eefc4a234f70694d46 (patch)
treece7d31b5b0b7840c0e1c2d063d167e0f128d5212 /usr.bin
parent03f76ed10563fc55c1f4f5da5e6fb37de80ef249 (diff)
move fatal() proto declaration to log.h; better for its use in usr.bin/rcs
OK joris@.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/cvs.h3
-rw-r--r--usr.bin/cvs/log.h3
-rw-r--r--usr.bin/cvs/xmalloc.c5
3 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index 9385e214a8b..23d09e60f0b 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cvs.h,v 1.91 2005/12/10 20:27:45 joris Exp $ */
+/* $OpenBSD: cvs.h,v 1.92 2005/12/19 18:21:30 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -428,7 +428,6 @@ struct cvs_lines {
struct cvs_tqh l_lines;
};
-void fatal(const char *, ...);
int cvs_readrepo(const char *, char *, size_t);
int cvs_modetostr(mode_t, char *, size_t);
int cvs_strtomode(const char *, mode_t *);
diff --git a/usr.bin/cvs/log.h b/usr.bin/cvs/log.h
index e6e2a7bd326..7010ae46a10 100644
--- a/usr.bin/cvs/log.h
+++ b/usr.bin/cvs/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.12 2005/07/27 15:45:44 xsa Exp $ */
+/* $OpenBSD: log.h,v 1.13 2005/12/19 18:21:31 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -67,5 +67,6 @@ int cvs_log(u_int, const char *, ...);
int cvs_vlog(u_int, const char *, va_list);
int cvs_printf(const char *, ...);
void cvs_putchar(int);
+void fatal(const char *, ...);
#endif /* LOG_H */
diff --git a/usr.bin/cvs/xmalloc.c b/usr.bin/cvs/xmalloc.c
index 3faa4b9a174..d5f29671704 100644
--- a/usr.bin/cvs/xmalloc.c
+++ b/usr.bin/cvs/xmalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.2 2005/12/13 17:46:10 xsa Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.3 2005/12/19 18:21:31 xsa Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -16,7 +16,8 @@
#include <stdlib.h>
#include <string.h>
-#include "cvs.h"
+#include "xmalloc.h"
+#include "log.h"
void *
xmalloc(size_t size)