===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffreg.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/diff/diffreg.c	2003/07/16 21:39:06	1.34
--- src/usr.bin/diff/diffreg.c	2003/07/17 21:54:28	1.35
***************
*** 1,4 ****
! /*	$OpenBSD: diffreg.c,v 1.34 2003/07/16 21:39:06 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diffreg.c,v 1.35 2003/07/17 21:54:28 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 65,71 ****
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.34 2003/07/16 21:39:06 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 65,71 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.35 2003/07/17 21:54:28 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 1066,1075 ****
  	}
  }
  
! #define POW2			/* define only if HALFLONG is 2**n */
! #define HALFLONG 16
! #define low(x)	(x&((1L<<HALFLONG)-1))
! #define high(x)	(x>>HALFLONG)
  
  /*
   * hashing has the effect of
--- 1066,1072 ----
  	}
  }
  
! #define HASHMASK (16 - 1)	/* for masking out 16 bytes */
  
  /*
   * hashing has the effect of
***************
*** 1093,1104 ****
  						return (0);
  					break;
  				}
! 				sum += (long)chrtran[t] << (shift
! #ifdef POW2
! 				    &= HALFLONG - 1);
! #else
! 				    %= HALFLONG);
! #endif
  			}
  		else
  			for (shift = 0; (t = getc(f)) != '\n'; shift += 7) {
--- 1090,1096 ----
  						return (0);
  					break;
  				}
! 				sum += (long)chrtran[t] << (shift &= HASHMASK);
  			}
  		else
  			for (shift = 0; (t = getc(f)) != '\n'; shift += 7) {
***************
*** 1107,1118 ****
  						return (0);
  					break;
  				}
! 				sum += (long)t << (shift
! #ifdef POW2
! 				    &= HALFLONG - 1);
! #else
! 				    %= HALFLONG);
! #endif
  			}
  	} else {
  		for (shift = 0;;) {
--- 1099,1105 ----
  						return (0);
  					break;
  				}
! 				sum += (long)t << (shift &= HASHMASK);
  			}
  	} else {
  		for (shift = 0;;) {
***************
*** 1126,1137 ****
  					shift += 7;
  					space = 0;
  				}
! 				sum += (long)chrtran[t] << (shift
! #ifdef POW2
! 				    &= HALFLONG - 1);
! #else
! 				    %= HALFLONG);
! #endif
  				shift += 7;
  				continue;
  			case EOF:
--- 1113,1119 ----
  					shift += 7;
  					space = 0;
  				}
! 				sum += (long)chrtran[t] << (shift &= HASHMASK);
  				shift += 7;
  				continue;
  			case EOF:
***************
*** 1144,1151 ****
  			break;
  		}
  	}
! 	sum = low(sum) + high(sum);
! 	return ((short) low(sum) + (short) high(sum));
  }
  
  int
--- 1126,1132 ----
  			break;
  		}
  	}
! 	return (sum);
  }
  
  int