===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/vars.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/mail/vars.c	1997/07/13 23:54:03	1.4
--- src/usr.bin/mail/vars.c	1997/11/14 00:24:01	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: vars.c,v 1.4 1997/07/13 23:54:03 millert Exp $	*/
  /*	$NetBSD: vars.c,v 1.4 1996/06/08 19:48:45 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: vars.c,v 1.5 1997/11/14 00:24:01 millert Exp $	*/
  /*	$NetBSD: vars.c,v 1.4 1996/06/08 19:48:45 christos Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: vars.c,v 1.4 1997/07/13 23:54:03 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: vars.c,v 1.5 1997/11/14 00:24:01 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 58,65 ****
  assign(name, value)
  	char name[], value[];
  {
! 	register struct var *vp;
! 	register int h;
  
  	h = hash(name);
  	vp = lookup(name);
--- 58,65 ----
  assign(name, value)
  	char name[], value[];
  {
! 	struct var *vp;
! 	int h;
  
  	h = hash(name);
  	vp = lookup(name);
***************
*** 103,109 ****
  		return("");
  	len = strlen(str) + 1;
  	if ((new = (char *)malloc(len)) == NULL)
! 		panic("Out of memory");
  	(void)memcpy(new, str, len);
  	return(new);
  }
--- 103,109 ----
  		return("");
  	len = strlen(str) + 1;
  	if ((new = (char *)malloc(len)) == NULL)
! 		errx(1, "Out of memory");
  	(void)memcpy(new, str, len);
  	return(new);
  }
***************
*** 117,123 ****
  value(name)
  	char name[];
  {
! 	register struct var *vp;
  
  	if ((vp = lookup(name)) == NOVAR)
  		return(getenv(name));
--- 117,123 ----
  value(name)
  	char name[];
  {
! 	struct var *vp;
  
  	if ((vp = lookup(name)) == NOVAR)
  		return(getenv(name));
***************
*** 131,139 ****
  
  struct var *
  lookup(name)
! 	register char name[];
  {
! 	register struct var *vp;
  
  	for (vp = variables[hash(name)]; vp != NOVAR; vp = vp->v_link)
  		if (*vp->v_name == *name && equal(vp->v_name, name))
--- 131,139 ----
  
  struct var *
  lookup(name)
! 	char name[];
  {
! 	struct var *vp;
  
  	for (vp = variables[hash(name)]; vp != NOVAR; vp = vp->v_link)
  		if (*vp->v_name == *name && equal(vp->v_name, name))
***************
*** 147,155 ****
  
  struct grouphead *
  findgroup(name)
! 	register char name[];
  {
! 	register struct grouphead *gh;
  
  	for (gh = groups[hash(name)]; gh != NOGRP; gh = gh->g_link)
  		if (*gh->g_name == *name && equal(gh->g_name, name))
--- 147,155 ----
  
  struct grouphead *
  findgroup(name)
! 	char name[];
  {
! 	struct grouphead *gh;
  
  	for (gh = groups[hash(name)]; gh != NOGRP; gh = gh->g_link)
  		if (*gh->g_name == *name && equal(gh->g_name, name))
***************
*** 164,171 ****
  printgroup(name)
  	char name[];
  {
! 	register struct grouphead *gh;
! 	register struct group *gp;
  
  	if ((gh = findgroup(name)) == NOGRP) {
  		printf("\"%s\": not a group\n", name);
--- 164,171 ----
  printgroup(name)
  	char name[];
  {
! 	struct grouphead *gh;
! 	struct group *gp;
  
  	if ((gh = findgroup(name)) == NOGRP) {
  		printf("\"%s\": not a group\n", name);
***************
*** 183,191 ****
   */
  int
  hash(name)
! 	register char *name;
  {
! 	register h = 0;
  
  	while (*name) {
  		h <<= 2;
--- 183,191 ----
   */
  int
  hash(name)
! 	char *name;
  {
! 	int h = 0;
  
  	while (*name) {
  		h <<= 2;