===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -c -r1.91 -r1.92
*** src/usr.bin/cvs/update.c	2007/01/28 23:37:29	1.91
--- src/usr.bin/cvs/update.c	2007/01/31 21:07:36	1.92
***************
*** 1,4 ****
! /*	$OpenBSD: update.c,v 1.91 2007/01/28 23:37:29 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: update.c,v 1.92 2007/01/31 21:07:36 xsa Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 140,146 ****
  void
  cvs_update_enterdir(struct cvs_file *cf)
  {
- 	int l;
  	char *entry;
  	CVSENTRIES *entlist;
  
--- 140,145 ----
***************
*** 155,164 ****
  			    cf->file_path, strerror(errno));
  
  		entry = xmalloc(CVS_ENT_MAXLINELEN);
! 		l = snprintf(entry, CVS_ENT_MAXLINELEN, "D/%s////",
  		    cf->file_name);
- 		if (l == -1 || l >= CVS_ENT_MAXLINELEN)
- 			fatal("cvs_update_enterdir: overflow");
  
  		entlist = cvs_ent_open(cf->file_wd);
  		cvs_ent_add(entlist, entry);
--- 154,161 ----
  			    cf->file_path, strerror(errno));
  
  		entry = xmalloc(CVS_ENT_MAXLINELEN);
! 		(void)xsnprintf(entry, CVS_ENT_MAXLINELEN, "D/%s////",
  		    cf->file_name);
  
  		entlist = cvs_ent_open(cf->file_wd);
  		cvs_ent_add(entlist, entry);
***************
*** 367,373 ****
  static void
  update_clear_conflict(struct cvs_file *cf)
  {
- 	int l;
  	time_t now;
  	CVSENTRIES *entlist;
  	char *entry, revbuf[16], timebuf[32];
--- 364,369 ----
***************
*** 382,391 ****
  	rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf));
  
  	entry = xmalloc(CVS_ENT_MAXLINELEN);
! 	l = snprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s//",
  	    cf->file_name, revbuf, timebuf);
- 	if (l == -1 || l >= CVS_ENT_MAXLINELEN)
- 		fatal("update_clear_conflict: overflow");
  
  	entlist = cvs_ent_open(cf->file_wd);
  	cvs_ent_add(entlist, entry);
--- 378,385 ----
  	rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf));
  
  	entry = xmalloc(CVS_ENT_MAXLINELEN);
! 	(void)xsnprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s//",
  	    cf->file_name, revbuf, timebuf);
  
  	entlist = cvs_ent_open(cf->file_wd);
  	cvs_ent_add(entlist, entry);