===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/strings.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/mail/strings.c	1997/07/14 00:24:30	1.5
--- src/usr.bin/mail/strings.c	1997/11/14 00:23:58	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: strings.c,v 1.5 1997/07/14 00:24:30 millert Exp $	*/
  /*	$NetBSD: strings.c,v 1.5 1996/06/08 19:48:40 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: strings.c,v 1.6 1997/11/14 00:23:58 millert Exp $	*/
  /*	$NetBSD: strings.c,v 1.5 1996/06/08 19:48:40 christos Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)strings.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: strings.c,v 1.5 1997/07/14 00:24:30 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)strings.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: strings.c,v 1.6 1997/11/14 00:23:58 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 65,73 ****
  salloc(size)
  	int size;
  {
! 	register char *t;
! 	register int s;
! 	register struct strings *sp;
  	int index;
  
  	s = size;
--- 65,73 ----
  salloc(size)
  	int size;
  {
! 	char *t;
! 	int s;
! 	struct strings *sp;
  	int index;
  
  	s = size;
***************
*** 82,95 ****
  		index++;
  	}
  	if (sp >= &stringdope[NSPACE])
! 		panic("String too large");
  	if (sp->s_topFree == NULL) {
  		index = sp - &stringdope[0];
  		sp->s_topFree = (char *)malloc(STRINGSIZE << index);
! 		if (sp->s_topFree == NULL) {
! 			fprintf(stderr, "No room for space %d\n", index);
! 			panic("Internal error");
! 		}
  		sp->s_nextFree = sp->s_topFree;
  		sp->s_nleft = STRINGSIZE << index;
  	}
--- 82,93 ----
  		index++;
  	}
  	if (sp >= &stringdope[NSPACE])
! 		errx(1, "String too large");
  	if (sp->s_topFree == NULL) {
  		index = sp - &stringdope[0];
  		sp->s_topFree = (char *)malloc(STRINGSIZE << index);
! 		if (sp->s_topFree == NULL)
! 			errx(1, "No room for space %d", index);
  		sp->s_nextFree = sp->s_topFree;
  		sp->s_nleft = STRINGSIZE << index;
  	}
***************
*** 107,114 ****
  void
  sreset()
  {
! 	register struct strings *sp;
! 	register int index;
  
  	if (noreset)
  		return;
--- 105,112 ----
  void
  sreset()
  {
! 	struct strings *sp;
! 	int index;
  
  	if (noreset)
  		return;
***************
*** 129,135 ****
  void
  spreserve()
  {
! 	register struct strings *sp;
  
  	for (sp = &stringdope[0]; sp < &stringdope[NSPACE]; sp++)
  		sp->s_topFree = NULL;
--- 127,133 ----
  void
  spreserve()
  {
! 	struct strings *sp;
  
  	for (sp = &stringdope[0]; sp < &stringdope[NSPACE]; sp++)
  		sp->s_topFree = NULL;