diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2009-02-21 12:52:48 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2009-02-21 12:52:48 +0000 |
| commit | 4e04a6d8d082537e6d0d5d3c51fceedbde1f44cb (patch) | |
| tree | 37e461a1bbe2f6543a5c264357d15e0afa6547e3 /usr.bin | |
| parent | 9e0217ae3f5ccf1b95434dbc221c8edb438a937f (diff) | |
cleanup of CVSROOT, we have no need for cr_flags,
cr_version or cr_vrmask[] its all very old stuff.
remove all macros using cr_vrmask as well, no use for them.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/cvs.h | 12 | ||||
| -rw-r--r-- | usr.bin/cvs/root.c | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index edc84482ba3..ba1f44a7ce2 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.172 2008/06/27 21:14:15 xsa Exp $ */ +/* $OpenBSD: cvs.h,v 1.173 2009/02/21 12:52:47 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -211,21 +211,11 @@ struct cvsroot { u_int cr_port; /* connection data */ - u_int cr_flags; FILE *cr_srvin; FILE *cr_srvout; FILE *cr_srverr; - char *cr_version; /* version of remote server */ - u_char cr_vrmask[16]; /* mask of valid requests supported by server */ - - TAILQ_ENTRY(cvsroot) root_cache; }; -#define CVS_SETVR(rt, rq) ((rt)->cr_vrmask[(rq) / 8] |= (1 << ((rq) % 8))) -#define CVS_GETVR(rt, rq) ((rt)->cr_vrmask[(rq) / 8] & (1 << ((rq) % 8))) -#define CVS_CLRVR(rt, rq) ((rt)->cr_vrmask[(rq) / 8] &= ~(1 << ((rq) % 8))) -#define CVS_RSTVR(rt) memset((rt)->cr_vrmask, 0, sizeof((rt)->cr_vrmask)) - #define CVS_HIST_ADDED 'A' #define CVS_HIST_EXPORT 'E' #define CVS_HIST_RELEASE 'F' diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c index a96d57fb46c..2d1288235e9 100644 --- a/usr.bin/cvs/root.c +++ b/usr.bin/cvs/root.c @@ -1,4 +1,4 @@ -/* $OpenBSD: root.c,v 1.45 2008/06/20 23:00:13 tobias Exp $ */ +/* $OpenBSD: root.c,v 1.46 2009/02/21 12:52:47 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -69,8 +69,6 @@ cvsroot_parse(const char *str) root = xcalloc(1, sizeof(*root)); root->cr_method = CVS_METHOD_NONE; - CVS_RSTVR(root); - root->cr_str = xstrdup(str); root->cr_buf = xstrdup(str); |