===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcs.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -c -r1.166 -r1.167
*** src/usr.bin/cvs/rcs.c	2006/04/13 19:55:41	1.166
--- src/usr.bin/cvs/rcs.c	2006/04/13 23:41:13	1.167
***************
*** 1,4 ****
! /*	$OpenBSD: rcs.c,v 1.166 2006/04/13 19:55:41 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcs.c,v 1.167 2006/04/13 23:41:13 ray Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 234,240 ****
  int rcs_errno = RCS_ERR_NOERR;
  char *timezone_flag = NULL;
  
! static int	rcs_parse_init(RCSFILE *);
  static int	rcs_parse_admin(RCSFILE *);
  static int	rcs_parse_delta(RCSFILE *);
  static void	rcs_parse_deltas(RCSFILE *, RCSNUM *);
--- 234,240 ----
  int rcs_errno = RCS_ERR_NOERR;
  char *timezone_flag = NULL;
  
! static void	rcs_parse_init(RCSFILE *);
  static int	rcs_parse_admin(RCSFILE *);
  static int	rcs_parse_delta(RCSFILE *);
  static void	rcs_parse_deltas(RCSFILE *, RCSNUM *);
***************
*** 312,322 ****
  	TAILQ_INIT(&(rfp->rf_symbols));
  	TAILQ_INIT(&(rfp->rf_locks));
  
! 	if (!(rfp->rf_flags & RCS_CREATE)
! 	    && (rcs_parse_init(rfp) < 0)) {
! 		rcs_close(rfp);
! 		return (NULL);
! 	}
  
  	/* fill in rd_locker */
  	TAILQ_FOREACH(lkr, &(rfp->rf_locks), rl_list) {
--- 312,319 ----
  	TAILQ_INIT(&(rfp->rf_symbols));
  	TAILQ_INIT(&(rfp->rf_locks));
  
! 	if (!(rfp->rf_flags & RCS_CREATE))
! 		rcs_parse_init(rfp);
  
  	/* fill in rd_locker */
  	TAILQ_FOREACH(lkr, &(rfp->rf_locks), rl_list) {
***************
*** 637,645 ****
  int
  rcs_head_set(RCSFILE *file, RCSNUM *rev)
  {
! 	struct rcs_delta *rd;
! 
! 	if ((rd = rcs_findrev(file, rev)) == NULL)
  		return (-1);
  
  	if (file->rf_head == NULL)
--- 634,640 ----
  int
  rcs_head_set(RCSFILE *file, RCSNUM *rev)
  {
! 	if (rcs_findrev(file, rev) == NULL)
  		return (-1);
  
  	if (file->rf_head == NULL)
***************
*** 1752,1769 ****
   * rcs_parse_init()
   *
   * Initial parsing of file <path>, which are in the RCS format.
!  * Just does admin section
!  * Returns 0 on success, or -1 on failure.
   */
! static int
  rcs_parse_init(RCSFILE *rfp)
  {
- 	int ret, count;
  	struct rcs_pdata *pdp;
  
- 	count = 0;
  	if (rfp->rf_flags & RCS_PARSED)
! 		return (0);
  
  	pdp = xcalloc(1, sizeof(*pdp));
  
--- 1747,1761 ----
   * rcs_parse_init()
   *
   * Initial parsing of file <path>, which are in the RCS format.
!  * Just does admin section.
   */
! static void
  rcs_parse_init(RCSFILE *rfp)
  {
  	struct rcs_pdata *pdp;
  
  	if (rfp->rf_flags & RCS_PARSED)
! 		return;
  
  	pdp = xcalloc(1, sizeof(*pdp));
  
***************
*** 1781,1787 ****
  	rfp->rf_flags &= ~RCS_SLOCK;
  	rfp->rf_pdata = pdp;
  
! 	if ((ret = rcs_parse_admin(rfp)) < 0) {
  		rcs_freepdata(pdp);
  		fatal("could not parse admin data");
  	}
--- 1773,1779 ----
  	rfp->rf_flags &= ~RCS_SLOCK;
  	rfp->rf_pdata = pdp;
  
! 	if (rcs_parse_admin(rfp) < 0) {
  		rcs_freepdata(pdp);
  		fatal("could not parse admin data");
  	}
***************
*** 1790,1796 ****
  		rcs_parse_deltatexts(rfp, NULL);
  
  	rfp->rf_flags |= RCS_SYNCED;
- 	return (0);
  }
  
  /*
--- 1782,1787 ----