diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-12-09 07:00:44 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-12-09 07:00:44 +0000 |
| commit | 05174f1652330bf05ea4fc2dd62aa0451d632b8b (patch) | |
| tree | 0201b64c4cd1ca6ed2f4aac36cd541106798dba7 /usr.bin | |
| parent | 7a2887037cef08e068e73132c69dfdefb5c7ef14 (diff) | |
don't complain too often about 'redefinition of revision number',
specially when rev is actually NULL.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/rcs/rcsprog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index c1e359b7e5e..6eb8eafbf56 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.51 2005/11/30 09:36:48 xsa Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.52 2005/12/09 07:00:43 joris Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -75,7 +75,7 @@ rcs_set_rev(const char *str, RCSNUM **rev) if (str == NULL) return; - if (*rev != RCS_HEAD_REV) + if ((*rev != NULL) && (*rev != RCS_HEAD_REV)) cvs_log(LP_WARN, "redefinition of revision number"); if ((*rev = rcsnum_parse(str)) == NULL) { |