# HG changeset patch
# User Francesco Potort��� <pot@gnu.org>
# Date 943015592 0
# Node ID aabdfbf65c68a016878df04df73e59777c92bf10
# Parent  3e580afd8e055d11ceb6116911611bc822ba5764
1999-11-19  Francesco Potorti`  <F.Potorti@cnuce.cnr.it>

	* etags.c (_GNU_SOURCE): Define only if undefined.
	(get_scheme): Declaration deleted.
	(main): error was called with an integer as second arg, instead of
	a char pointer.
	(canonicalize_filename): Bug removed.

1999-11-18  Dave Love  <d.love@dl.ac.uk>

	* etags.c (C_entries): Rename label `intoken', avoiding K&R
	lossage from name clash with macro.

diff -r 3e580afd8e05 -r aabdfbf65c68 lib-src/etags.c
--- a/lib-src/etags.c	Fri Nov 19 12:45:11 1999 +0000
+++ b/lib-src/etags.c	Fri Nov 19 12:46:32 1999 +0000
@@ -31,12 +31,14 @@
  *	Francesco Potorti` (pot@gnu.org) is the current maintainer.
  */
 
-char pot_etags_version[] = "@(#) pot revision number is 13.31";
+char pot_etags_version[] = "@(#) pot revision number is 13.33";
 
 #define	TRUE	1
 #define	FALSE	0
 
-#define _GNU_SOURCE		/* enables some compiler checks on GNU */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE		/* enables some compiler checks on GNU */
+#endif
 #ifndef DEBUG
 # define DEBUG FALSE
 #endif
@@ -934,7 +936,7 @@
 	case 'o':
 	  if (tagfile)
 	    {
-	      error ("-%c option may only be given once.", opt);
+	      error ("-o option may only be given once.", (char *)NULL);
 	      suggest_asking_for_help ();
 	    }
 	  tagfile = optarg;
@@ -1012,7 +1014,7 @@
 
   if (nincluded_files == 0 && file_count == 0)
     {
-      error ("no input files specified.", 0);
+      error ("no input files specified.", (char *)NULL);
       suggest_asking_for_help ();
     }
 
@@ -2786,7 +2788,7 @@
 		      lp += 2;
 		      toklen += 2;
 		      c = lp[-1];
-		      goto intoken;
+		      goto intok;
 		    }
 		  else
 		    {
@@ -2881,7 +2883,7 @@
 		    }
 		} /* if (endtoken (c)) */
 	      else if (intoken (c))
-		intoken:
+		intok:
 		{
 		  toklen++;
 		  continue;
@@ -4113,8 +4115,6 @@
  * look for (set! xyzzy
  */
 
-void get_scheme ();
-
 void
 Scheme_functions (inf)
      FILE *inf;
@@ -5401,13 +5401,13 @@
      register char *fn;
 {
 #ifdef DOS_NT
+  /* Canonicalize drive letter case.  */
+  if (islower (fn[0]))
+    fn[0] = toupper (fn[0]);
   /* Convert backslashes to slashes.  */
   for (; *fn != '\0'; fn++)
     if (*fn == '\\')
       *fn = '/';
-  /* Canonicalize drive letter case.  */
-  if (islower (path[0]))
-    path[0] = toupper (path[0]);
 #else
   /* No action. */
   fn = NULL;			/* shut up the compiler */