===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/eval.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/m4/eval.c	1999/09/14 08:23:09	1.16
--- src/usr.bin/m4/eval.c	1999/09/14 08:35:16	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: eval.c,v 1.16 1999/09/14 08:23:09 espie Exp $	*/
  /*	$NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: eval.c,v 1.17 1999/09/14 08:35:16 espie Exp $	*/
  /*	$NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $	*/
  
  /*
***************
*** 41,47 ****
  #if 0
  static char sccsid[] = "@(#)eval.c	8.2 (Berkeley) 4/27/95";
  #else
! static char rcsid[] = "$OpenBSD: eval.c,v 1.16 1999/09/14 08:23:09 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 41,47 ----
  #if 0
  static char sccsid[] = "@(#)eval.c	8.2 (Berkeley) 4/27/95";
  #else
! static char rcsid[] = "$OpenBSD: eval.c,v 1.17 1999/09/14 08:35:16 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 86,96 ****
  
  void
  eval(argv, argc, td)
! register char *argv[];
! register int argc;
! register int td;
  {
! 	register int c, n;
  	static int sysval = 0;
  
  #ifdef DEBUG
--- 86,96 ----
  
  void
  eval(argv, argc, td)
! 	char *argv[];
! 	int argc;
! 	int td;
  {
! 	int c, n;
  	static int sysval = 0;
  
  #ifdef DEBUG
***************
*** 392,404 ****
   */
  void
  expand(argv, argc)
! register char *argv[];
! register int argc;
  {
! 	register char *t;
! 	register char *p;
! 	register int n;
! 	register int argno;
  
  	t = argv[0];		       /* defn string as a whole */
  	p = t;
--- 392,404 ----
   */
  void
  expand(argv, argc)
! 	char *argv[];
! 	int argc;
  {
! 	char *t;
! 	char *p;
! 	int n;
! 	int argno;
  
  	t = argv[0];		       /* defn string as a whole */
  	p = t;
***************
*** 463,472 ****
   */
  void
  dodefine(name, defn)
! register char *name;
! register char *defn;
  {
! 	register ndptr p;
  
  	if (!*name)
  		errx(1, "null definition.");
--- 463,472 ----
   */
  void
  dodefine(name, defn)
! 	char *name;
! 	char *defn;
  {
! 	ndptr p;
  
  	if (!*name)
  		errx(1, "null definition.");
***************
*** 489,497 ****
   */
  void
  dodefn(name)
! char *name;
  {
! 	register ndptr p;
  
  	if ((p = lookup(name)) != nil && p->defn != null) {
  		pbstr(rquote);
--- 489,497 ----
   */
  void
  dodefn(name)
! 	char *name;
  {
! 	ndptr p;
  
  	if ((p = lookup(name)) != nil && p->defn != null) {
  		pbstr(rquote);
***************
*** 509,518 ****
   */
  void
  dopushdef(name, defn)
! register char *name;
! register char *defn;
  {
! 	register ndptr p;
  
  	if (!*name)
  		errx(1, "null definition");
--- 509,518 ----
   */
  void
  dopushdef(name, defn)
! 	char *name;
! 	char *defn;
  {
! 	ndptr p;
  
  	if (!*name)
  		errx(1, "null definition");
***************
*** 533,542 ****
   */
  void
  dodump(argv, argc)
! register char *argv[];
! register int argc;
  {
! 	register int n;
  	ndptr p;
  
  	if (argc > 2) {
--- 533,542 ----
   */
  void
  dodump(argv, argc)
! 	char *argv[];
! 	int argc;
  {
! 	int n;
  	ndptr p;
  
  	if (argc > 2) {
***************
*** 557,564 ****
   */
  void
  doifelse(argv, argc)
! register char *argv[];
! register int argc;
  {
  	cycle {
  		if (STREQ(argv[2], argv[3]))
--- 557,564 ----
   */
  void
  doifelse(argv, argc)
! 	char *argv[];
! 	int argc;
  {
  	cycle {
  		if (STREQ(argv[2], argv[3]))
***************
*** 579,585 ****
   */
  int
  doincl(ifile)
! char *ifile;
  {
  	if (ilevel + 1 == MAXINP)
  		errx(1, "too many include files.");
--- 579,585 ----
   */
  int
  doincl(ifile)
! 	char *ifile;
  {
  	if (ilevel + 1 == MAXINP)
  		errx(1, "too many include files.");
***************
*** 598,607 ****
   */
  int
  dopaste(pfile)
! char *pfile;
  {
  	FILE *pf;
! 	register int c;
  
  	if ((pf = fopen(pfile, "r")) != NULL) {
  		while ((c = getc(pf)) != EOF)
--- 598,607 ----
   */
  int
  dopaste(pfile)
! 	char *pfile;
  {
  	FILE *pf;
! 	int c;
  
  	if ((pf = fopen(pfile, "r")) != NULL) {
  		while ((c = getc(pf)) != EOF)
***************
*** 618,625 ****
   */
  void
  dochq(argv, argc)
! register char *argv[];
! register int argc;
  {
  	if (argc > 2) {
  		if (*argv[2])
--- 618,625 ----
   */
  void
  dochq(argv, argc)
! 	char *argv[];
! 	int argc;
  {
  	if (argc > 2) {
  		if (*argv[2])
***************
*** 644,651 ****
   */
  void
  dochc(argv, argc)
! register char *argv[];
! register int argc;
  {
  	if (argc > 2) {
  		if (*argv[2])
--- 644,651 ----
   */
  void
  dochc(argv, argc)
! 	char *argv[];
! 	int argc;
  {
  	if (argc > 2) {
  		if (*argv[2])
***************
*** 668,674 ****
   */
  void
  dodiv(n)
! register int n;
  {
  	int fd;
  
--- 668,674 ----
   */
  void
  dodiv(n)
! 	int n;
  {
  	int fd;
  
***************
*** 693,703 ****
   */
  void
  doundiv(argv, argc)
! register char *argv[];
! register int argc;
  {
! 	register int ind;
! 	register int n;
  
  	if (argc > 2) {
  		for (ind = 2; ind < argc; ind++) {
--- 693,703 ----
   */
  void
  doundiv(argv, argc)
! 	char *argv[];
! 	int argc;
  {
! 	int ind;
! 	int n;
  
  	if (argc > 2) {
  		for (ind = 2; ind < argc; ind++) {
***************
*** 718,728 ****
   */
  void
  dosub(argv, argc)
! register char *argv[];
! register int argc;
  {
! 	register char *ap, *fc, *k;
! 	register int nc;
  
  	if (argc < 5)
  		nc = MAXTOK;
--- 718,728 ----
   */
  void
  dosub(argv, argc)
! 	char *argv[];
! 	int argc;
  {
! 	char *ap, *fc, *k;
! 	int nc;
  
  	if (argc < 5)
  		nc = MAXTOK;
***************
*** 770,782 ****
   */
  void
  map(dest, src, from, to)
! register char *dest;
! register char *src;
! register char *from;
! register char *to;
  {
! 	register char *tmp;
! 	register char sch, dch;
  	static char mapvec[128] = {
  		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
  		12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
--- 770,782 ----
   */
  void
  map(dest, src, from, to)
! 	char *dest;
! 	char *src;
! 	char *from;
! 	char *to;
  {
! 	char *tmp;
! 	char sch, dch;
  	static char mapvec[128] = {
  		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
  		12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,