diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-09 14:03:21 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-09 14:03:21 +0000 |
| commit | c7228a1903a177a51210df19d874e0e1b2de6a21 (patch) | |
| tree | fdc9cc203d541f4d12946209c3ccef31c078e024 /usr.bin/cvs/rcsnum.c | |
| parent | 138924ed53f662e659d3a013552fd6b48793259d (diff) | |
- always remove the additional .0 from magic branches, even when
running the log command.
- change getlog.c so it will add any .0 for magic branches in its output
if required
less confusing for rcs_translate_tag();
Diffstat (limited to 'usr.bin/cvs/rcsnum.c')
| -rw-r--r-- | usr.bin/cvs/rcsnum.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c index d468207645c..62bf2b2e7d7 100644 --- a/usr.bin/cvs/rcsnum.c +++ b/usr.bin/cvs/rcsnum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsnum.c,v 1.50 2008/01/31 22:19:36 tobias Exp $ */ +/* $OpenBSD: rcsnum.c,v 1.51 2008/02/09 14:03:20 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -32,8 +32,6 @@ static void rcsnum_setsize(RCSNUM *, u_int); static char *rcsnum_itoa(u_int16_t, char *, size_t); -int rcsnum_flags; - /* * rcsnum_alloc() * @@ -287,8 +285,7 @@ rcsnum_aton(const char *str, char **ep, RCSNUM *nump) * completely insane and not understandable reason in that output. * */ - if (nump->rn_len > 2 && nump->rn_id[nump->rn_len - 1] == 0 - && !(rcsnum_flags & RCSNUM_NO_MAGIC)) { + if (nump->rn_len > 2 && nump->rn_id[nump->rn_len - 1] == 0) { /* * Look for ".0.x" at the end of the branch number. */ |