diff options
| author | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-12-15 05:09:07 +0000 |
|---|---|---|
| committer | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-12-15 05:09:07 +0000 |
| commit | 679c40787a087851e0878c35c315f71eddaf0bd2 (patch) | |
| tree | f642f7bb986fe905bfafcb5d1be12bc574a19554 /usr.bin | |
| parent | f3f52f34475ca68bce3bf9aad3faad77e24288fd (diff) | |
we don't need a separate header for 4 function prototypes, move
them in rcs.h
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/cache.c | 5 | ||||
| -rw-r--r-- | usr.bin/cvs/cache.h | 39 | ||||
| -rw-r--r-- | usr.bin/cvs/rcs.h | 7 |
3 files changed, 8 insertions, 43 deletions
diff --git a/usr.bin/cvs/cache.c b/usr.bin/cvs/cache.c index e090ff36801..e9bce11087c 100644 --- a/usr.bin/cvs/cache.c +++ b/usr.bin/cvs/cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.c,v 1.2 2004/12/07 17:10:56 tedu Exp $ */ +/* $OpenBSD: cache.c,v 1.3 2004/12/15 05:09:06 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -36,7 +36,6 @@ #include "log.h" #include "rcs.h" -#include "cache.h" #define RCS_CACHE_BUCKETS 256 @@ -48,7 +47,7 @@ struct rcs_cachent { struct timeval rc_atime; TAILQ_ENTRY(rcs_cachent) rc_list; - TAILQ_ENTRY(rcs_cachent) rc_lru; + TAILQ_ENTRY(rcs_cachent) rc_lru; }; diff --git a/usr.bin/cvs/cache.h b/usr.bin/cvs/cache.h deleted file mode 100644 index fb85e6975a4..00000000000 --- a/usr.bin/cvs/cache.h +++ /dev/null @@ -1,39 +0,0 @@ -/* $OpenBSD: cache.h,v 1.3 2004/12/09 19:54:09 jfb Exp $ */ -/* - * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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. - */ - -#ifndef CACHE_H -#define CACHE_H - -#include <sys/types.h> - -#include "rcs.h" - -int rcs_cache_init (u_int); -RCSFILE *rcs_cache_fetch (const char *path); -int rcs_cache_store (RCSFILE *); -void rcs_cache_destroy (void); - -#endif /* CACHE_H */ diff --git a/usr.bin/cvs/rcs.h b/usr.bin/cvs/rcs.h index 6cfc273f214..d6ace23f5bd 100644 --- a/usr.bin/cvs/rcs.h +++ b/usr.bin/cvs/rcs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.h,v 1.2 2004/12/07 17:10:56 tedu Exp $ */ +/* $OpenBSD: rcs.h,v 1.3 2004/12/15 05:09:06 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -143,5 +143,10 @@ char* rcsnum_tostr (const RCSNUM *, char *, size_t); int rcsnum_cpy (const RCSNUM *, RCSNUM *, u_int); int rcsnum_cmp (const RCSNUM *, const RCSNUM *, u_int); +/* from cache.c */ +int rcs_cache_init (u_int); +RCSFILE *rcs_cache_fetch (const char *path); +int rcs_cache_store (RCSFILE *); +void rcs_cache_destroy (void); #endif /* RCS_H */ |