===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffreg.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/diff/diffreg.c	2003/06/25 03:02:33	1.3
--- src/usr.bin/diff/diffreg.c	2003/06/25 03:25:29	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: diffreg.c,v 1.3 2003/06/25 03:02:33 tedu Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diffreg.c,v 1.4 2003/06/25 03:25:29 tedu Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 132,139 ****
  } *file[2], line;
  
  int len[2];
! struct line *sfile[2];		/* shortened by pruning common prefix and
! 				 * suffix */
  int slen[2];
  int pref, suff;			/* length of prefix and suffix */
  int *class;			/* will be overlaid on file[0] */
--- 132,138 ----
  } *file[2], line;
  
  int len[2];
! struct line *sfile[2];	/* shortened by pruning common prefix and suffix */
  int slen[2];
  int pref, suff;			/* length of prefix and suffix */
  int *class;			/* will be overlaid on file[0] */
***************
*** 320,330 ****
  
  	member = (int *)file[1];
  	equiv(sfile[0], slen[0], sfile[1], slen[1], member);
! 	member = ralloc((char *) member, (slen[1] + 2) * sizeof(int));
  
! 	class = (int *) file[0];
  	unsort(sfile[0], slen[0], class);
! 	class = ralloc((char *) class, (slen[0] + 2) * sizeof(int));
  
  	klist = talloc((slen[0] + 2) * sizeof(int));
  	clist = talloc(sizeof(cand));
--- 319,329 ----
  
  	member = (int *)file[1];
  	equiv(sfile[0], slen[0], sfile[1], slen[1], member);
! 	member = ralloc(member, (slen[1] + 2) * sizeof(int));
  
! 	class = (int *)file[0];
  	unsort(sfile[0], slen[0], class);
! 	class = ralloc(class, (slen[0] + 2) * sizeof(int));
  
  	klist = talloc((slen[0] + 2) * sizeof(int));
  	clist = talloc(sizeof(cand));
***************
*** 396,402 ****
  }
  
  static void
! prepare(int i, FILE * fd)
  {
  	struct line *p;
  	int j, h;
--- 395,401 ----
  }
  
  static void
! prepare(int i, FILE *fd)
  {
  	struct line *p;
  	int j, h;
***************
*** 404,410 ****
  	fseek(fd, 0, 0);
  	p = talloc(3 * sizeof(line));
  	for (j = 0; (h = readhash(fd));) {
! 		p = (struct line *) ralloc((char *) p, (++j + 3) * sizeof(line));
  		p[j].value = h;
  	}
  	len[i] = j;
--- 403,409 ----
  	fseek(fd, 0, 0);
  	p = talloc(3 * sizeof(line));
  	for (j = 0; (h = readhash(fd));) {
! 		p = ralloc(p, (++j + 3) * sizeof(line));
  		p[j].value = h;
  	}
  	len[i] = j;
***************
*** 430,436 ****
  }
  
  static void
! equiv(struct line * a, int n, struct line * b, int m, int *c)
  {
  	int i, j;
  	i = j = 1;
--- 429,435 ----
  }
  
  static void
! equiv(struct line *a, int n, struct line *b, int m, int *c)
  {
  	int i, j;
  	i = j = 1;
***************
*** 500,506 ****
  {
  	struct cand *q;
  
! 	clist = (struct cand *) ralloc((char *) clist, ++clen * sizeof(cand));
  	q = clist + clen - 1;
  	q->x = x;
  	q->y = y;
--- 499,505 ----
  {
  	struct cand *q;
  
! 	clist = ralloc(clist, ++clen * sizeof(cand));
  	q = clist + clen - 1;
  	q->x = x;
  	q->y = y;
***************
*** 652,658 ****
  }
  
  static void
! sort(struct line * a, int n)
  {				/* shellsort CACM #201 */
  	struct line w;
  	int j, m = 0;		/* gcc */
--- 651,657 ----
  }
  
  static void
! sort(struct line *a, int n)
  {				/* shellsort CACM #201 */
  	struct line w;
  	int j, m = 0;		/* gcc */
***************
*** 687,693 ****
  }
  
  static void
! unsort(struct line * f, int l, int *b)
  {
  	int *a;
  	int i;
--- 686,692 ----
  }
  
  static void
! unsort(struct line *f, int l, int *b)
  {
  	int *a;
  	int i;
***************
*** 880,886 ****
  }
  
  static void
! fetch(long *f, int a, int b, FILE * lb, char *s, int oldfile)
  {
  	int i, j;
  	int c;
--- 879,885 ----
  }
  
  static void
! fetch(long *f, int a, int b, FILE *lb, char *s, int oldfile)
  {
  	int i, j;
  	int c;
***************
*** 955,961 ****
   * summing 1-s complement in 16-bit hunks
   */
  static int
! readhash(FILE * f)
  {
  	long sum;
  	unsigned shift;
--- 954,960 ----
   * summing 1-s complement in 16-bit hunks
   */
  static int
! readhash(FILE *f)
  {
  	long sum;
  	unsigned shift;
***************
*** 1020,1026 ****
  }
  
  static int
! asciifile(FILE * f)
  {
  	char buf[BUFSIZ];
  	int cnt;
--- 1019,1025 ----
  }
  
  static int
! asciifile(FILE *f)
  {
  	char buf[BUFSIZ];
  	int cnt;