===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff_internals.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/cvs/diff_internals.c	2007/05/28 23:02:40	1.8
--- src/usr.bin/cvs/diff_internals.c	2007/05/29 00:19:10	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: diff_internals.c,v 1.8 2007/05/28 23:02:40 ray Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: diff_internals.c,v 1.9 2007/05/29 00:19:10 ray Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
***************
*** 295,301 ****
  {
  	FILE *f1, *f2;
  	int i, rval;
- 	void *tmp;
  
  	f1 = f2 = NULL;
  	rval = D_SAME;
--- 295,300 ----
***************
*** 351,363 ****
  
  	member = (int *)file[1];
  	equiv(sfile[0], slen[0], sfile[1], slen[1], member);
! 	tmp = xrealloc(member, slen[1] + 2, sizeof(*member));
! 	member = tmp;
  
  	class = (int *)file[0];
  	unsort(sfile[0], slen[0], class);
! 	tmp = xrealloc(class, slen[0] + 2, sizeof(*class));
! 	class = tmp;
  
  	klist = xcalloc(slen[0] + 2, sizeof(*klist));
  	clen = 0;
--- 350,360 ----
  
  	member = (int *)file[1];
  	equiv(sfile[0], slen[0], sfile[1], slen[1], member);
! 	member = xrealloc(member, slen[1] + 2, sizeof(*member));
  
  	class = (int *)file[0];
  	unsort(sfile[0], slen[0], class);
! 	class = xrealloc(class, slen[0] + 2, sizeof(*class));
  
  	klist = xcalloc(slen[0] + 2, sizeof(*klist));
  	clen = 0;
***************
*** 370,386 ****
  	xfree(member);
  	xfree(class);
  
! 	tmp = xrealloc(J, diff_len[0] + 2, sizeof(*J));
! 	J = tmp;
  	unravel(klist[i]);
  	xfree(clist);
  	xfree(klist);
  
! 	tmp = xrealloc(ixold, diff_len[0] + 2, sizeof(*ixold));
! 	ixold = tmp;
  
! 	tmp = xrealloc(ixnew, diff_len[1] + 2, sizeof(*ixnew));
! 	ixnew = tmp;
  	check(f1, f2);
  	output(f1, f2);
  
--- 367,380 ----
  	xfree(member);
  	xfree(class);
  
! 	J = xrealloc(J, diff_len[0] + 2, sizeof(*J));
  	unravel(klist[i]);
  	xfree(clist);
  	xfree(klist);
  
! 	ixold = xrealloc(ixold, diff_len[0] + 2, sizeof(*ixold));
  
! 	ixnew = xrealloc(ixnew, diff_len[1] + 2, sizeof(*ixnew));
  	check(f1, f2);
  	output(f1, f2);
  
***************
*** 428,434 ****
  static int
  prepare(int i, FILE *fd, off_t filesize)
  {
- 	void *tmp;
  	struct line *p;
  	int j, h;
  	size_t sz;
--- 422,427 ----
***************
*** 443,450 ****
  	for (j = 0; (h = readhash(fd));) {
  		if (j == (int)sz) {
  			sz = sz * 3 / 2;
! 			tmp = xrealloc(p, sz + 3, sizeof(*p));
! 			p = tmp;
  		}
  		p[++j].value = h;
  	}
--- 436,442 ----
  	for (j = 0; (h = readhash(fd));) {
  		if (j == (int)sz) {
  			sz = sz * 3 / 2;
! 			p = xrealloc(p, sz + 3, sizeof(*p));
  		}
  		p[++j].value = h;
  	}
***************
*** 578,590 ****
  static int
  newcand(int x, int y, int pred)
  {
! 	struct cand *q, *tmp;
  	int newclistlen;
  
  	if (clen == clistlen) {
  		newclistlen = clistlen * 11 / 10;
! 		tmp = xrealloc(clist, newclistlen, sizeof(*clist));
! 		clist = tmp;
  		clistlen = newclistlen;
  	}
  	q = clist + clen;
--- 570,581 ----
  static int
  newcand(int x, int y, int pred)
  {
! 	struct cand *q;
  	int newclistlen;
  
  	if (clen == clistlen) {
  		newclistlen = clistlen * 11 / 10;
! 		clist = xrealloc(clist, newclistlen, sizeof(*clist));
  		clistlen = newclistlen;
  	}
  	q = clist + clen;
***************
*** 923,934 ****
  		 * Allocate change records as needed.
  		 */
  		if (context_vec_ptr == context_vec_end - 1) {
- 			struct context_vec *tmp;
  			ptrdiff_t offset = context_vec_ptr - context_vec_start;
  			max_context <<= 1;
! 			tmp = xrealloc(context_vec_start, max_context,
! 			    sizeof(*context_vec_start));
! 			context_vec_start = tmp;
  			context_vec_end = context_vec_start + max_context;
  			context_vec_ptr = context_vec_start + offset;
  		}
--- 914,923 ----
  		 * Allocate change records as needed.
  		 */
  		if (context_vec_ptr == context_vec_end - 1) {
  			ptrdiff_t offset = context_vec_ptr - context_vec_start;
  			max_context <<= 1;
! 			context_vec_start = xrealloc(context_vec_start,
! 			    max_context, sizeof(*context_vec_start));
  			context_vec_end = context_vec_start + max_context;
  			context_vec_ptr = context_vec_start + offset;
  		}