===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/cvs/diff3.c	2006/03/16 08:32:34	1.19
--- src/usr.bin/cvs/diff3.c	2006/03/25 21:29:59	1.20
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.19 2006/03/16 08:32:34 xsa Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.20 2006/03/25 21:29:59 ray Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.19 2006/03/16 08:32:34 xsa Exp $";
  #endif /* not lint */
  
  #include "includes.h"
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.20 2006/03/25 21:29:59 ray Exp $";
  #endif /* not lint */
  
  #include "includes.h"
***************
*** 140,149 ****
  static char *getchange(FILE *);
  static char *getline(FILE *, size_t *);
  static int number(char **);
! static int readin(char *, struct diff **);
  static int skip(int, int, char *);
  static int edscript(int);
! static int merge(int, int);
  static void change(int, struct range *, int);
  static void keep(int, struct range *);
  static void prange(struct range *);
--- 140,149 ----
  static char *getchange(FILE *);
  static char *getline(FILE *, size_t *);
  static int number(char **);
! static size_t readin(char *, struct diff **);
  static int skip(int, int, char *);
  static int edscript(int);
! static int merge(size_t, size_t);
  static void change(int, struct range *, int);
  static void keep(int, struct range *);
  static void prange(struct range *);
***************
*** 271,277 ****
  static int
  diff3_internal(int argc, char **argv, const char *fmark, const char *rmark)
  {
! 	int i, m, n;
  
  	/* XXX */
  	eflag = 3;
--- 271,278 ----
  static int
  diff3_internal(int argc, char **argv, const char *fmark, const char *rmark)
  {
! 	size_t m, n;
! 	int i;
  
  	/* XXX */
  	eflag = 3;
***************
*** 402,408 ****
   * since the vector is processed in one sequential pass.
   * The vector could be optimized out of existence)
   */
! static int
  readin(char *name, struct diff **dd)
  {
  	int a, b, c, d;
--- 403,409 ----
   * since the vector is processed in one sequential pass.
   * The vector could be optimized out of existence)
   */
! static size_t
  readin(char *name, struct diff **dd)
  {
  	int a, b, c, d;
***************
*** 499,505 ****
  }
  
  static int
! merge(int m1, int m2)
  {
  	struct diff *d1, *d2, *d3;
  	int dpl, j, t1, t2;
--- 500,506 ----
  }
  
  static int
! merge(size_t m1, size_t m2)
  {
  	struct diff *d1, *d2, *d3;
  	int dpl, j, t1, t2;
***************
*** 510,519 ****
  	while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) {
  		if (debug) {
  			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
! 			d1->old.from,d1->old.to,
! 			d1->new.from,d1->new.to,
! 			d2->old.from,d2->old.to,
! 			d2->new.from,d2->new.to);
  		}
  
  		/* first file is different from others */
--- 511,520 ----
  	while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) {
  		if (debug) {
  			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
! 			d1->old.from, d1->old.to,
! 			d1->new.from, d1->new.to,
! 			d2->old.from, d2->old.to,
! 			d2->new.from, d2->new.to);
  		}
  
  		/* first file is different from others */