X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a5c7ef8bc4f3bea8330c4c685c97d885bf0164d5..041470d2d9125f8459708b39da8e29c4c51fb70e:/lib-src/etags.c

diff --git a/lib-src/etags.c b/lib-src/etags.c
index ebc76904f7..552a09d2f0 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -28,15 +28,17 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
  *	Francesco Potorti` reorganised C and C++ based on work by Joe Wells.
  *	Regexp tags by Tom Tromey.
  *
- *	Francesco Potorti` (F.Potorti@cnuce.cnr.it) is the current maintainer.
+ *	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 @@ main (argc, argv)
 	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 @@ main (argc, argv)
 
   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 @@ C_entries (c_ext, inf)
 		      lp += 2;
 		      toklen += 2;
 		      c = lp[-1];
-		      goto intoken;
+		      goto intok;
 		    }
 		  else
 		    {
@@ -2881,7 +2883,7 @@ C_entries (c_ext, inf)
 		    }
 		} /* if (endtoken (c)) */
 	      else if (intoken (c))
-		intoken:
+		intok:
 		{
 		  toklen++;
 		  continue;
@@ -4113,8 +4115,6 @@ Postscript_functions (inf)
  * look for (set! xyzzy
  */
 
-void get_scheme ();
-
 void
 Scheme_functions (inf)
      FILE *inf;
@@ -5401,13 +5401,13 @@ canonicalize_filename (fn)
      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 */