darwin.h (SUBTARGET_OVERRIDE_OPTIONS): Use %qs instead of `%s' in diagnostic.

	* config/rs6000/darwin.h (SUBTARGET_OVERRIDE_OPTIONS): Use %qs
	instead of `%s' in diagnostic.

cp:
	* g++spec.c, lex.c: Avoid ` as left quote in diagnostics.

fortran:
	* f95-lang.c, gfortranspec.c, trans-decl.c: Avoid ` as left quote
	in diagnostics.

java:
	* gjavah.c, jcf-dump.c, jv-scan.c, jvspec.c: Avoid ` as left quote
	in diagnostics.

From-SVN: r91282

5 files changed, 23 insertions, 18 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 24e1ce6..ce06a29 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-25  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* gjavah.c, jcf-dump.c, jv-scan.c, jvspec.c: Avoid ` as left quote
+	in diagnostics.
+
 2004-11-24  Richard Henderson  <rth@redhat.com>
 
 	* verify-glue.c (vfy_init_name, vfy_clinit_name, vfy_object_type,
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 0badaf1..1f25ce6 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -888,7 +888,7 @@ print_method_info (FILE *stream, JCF* jcf, int name_index, int sig_index,
 	{
 	  /* FIXME: i18n bug here.  Order of prints should not be
 	     fixed.  */
-	  fprintf (stderr, _("ignored method `"));
+	  fprintf (stderr, _("ignored method '"));
 	  jcf_print_utf8 (stderr, str, length);
 	  fprintf (stderr, _("' marked virtual\n"));
 	  found_error = 1;
@@ -1471,7 +1471,7 @@ print_c_decl (FILE* stream, JCF* jcf, int name_index, int signature_index,
 	  next = decode_signature_piece (stream, str, limit, &need_space);
 	  if (! next)
 	    {
-	      error ("unparseable signature: `%s'", str0);
+	      error ("unparseable signature: '%s'", str0);
 	      return;
 	    }
 	}
@@ -1573,7 +1573,7 @@ print_full_cxx_name (FILE* stream, JCF* jcf, int name_index,
 	  next = decode_signature_piece (stream, str, limit, &need_space);
 	  if (! next)
 	    {
-	      error ("unparseable signature: `%s'", str0);
+	      error ("unparseable signature: '%s'", str0);
 	      return;
 	    }
 	  
@@ -1648,7 +1648,7 @@ print_stub_or_jni (FILE* stream, JCF* jcf, int name_index,
 	  next = decode_signature_piece (stream, str, limit, &need_space);
 	  if (! next)
 	    {
-	      error ("unparseable signature: `%s'", str0);
+	      error ("unparseable signature: '%s'", str0);
 	      return;
 	    }
 	}
@@ -2319,7 +2319,7 @@ static const struct option options[] =
 static void
 usage (void)
 {
-  fprintf (stderr, _("Try `gcjh --help' for more information.\n"));
+  fprintf (stderr, _("Try 'gcjh --help' for more information.\n"));
   exit (1);
 }
 
@@ -2333,7 +2333,7 @@ help (void)
   printf ("\n");
   printf (_("  -add TEXT               Insert TEXT into class body\n"));
   printf (_("  -append TEXT            Insert TEXT after class declaration\n"));
-  printf (_("  -friend TEXT            Insert TEXT as `friend' declaration\n"));
+  printf (_("  -friend TEXT            Insert TEXT as 'friend' declaration\n"));
   printf (_("  -prepend TEXT           Insert TEXT before start of class\n"));
   printf ("\n");
   printf (_("  --classpath PATH        Set path to find .class files\n"));
@@ -2477,7 +2477,7 @@ main (int argc, char** argv)
 	  break;
 
 	case OPT_MG:
-	  error ("`-MG' option is unimplemented");
+	  error ("'-MG' option is unimplemented");
 	  exit (1);
 
 	case OPT_MD:
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 5f25369..93d640f 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -882,7 +882,7 @@ static const struct option options[] =
 static void
 usage (void)
 {
-  fprintf (stderr, _("Try `jcf-dump --help' for more information.\n"));
+  fprintf (stderr, _("Try 'jcf-dump --help' for more information.\n"));
   exit (1);
 }
 
@@ -892,7 +892,7 @@ help (void)
   printf (_("Usage: jcf-dump [OPTION]... CLASS...\n\n"));
   printf (_("Display contents of a class file in readable form.\n\n"));
   printf (_("  -c                      Disassemble method bodies\n"));
-  printf (_("  --javap                 Generate output in `javap' format\n"));
+  printf (_("  --javap                 Generate output in 'javap' format\n"));
   printf ("\n");
   printf (_("  --classpath PATH        Set path to find .class files\n"));
   printf (_("  -IDIR                   Append directory to class path\n"));
diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index 9892605..3c55d59 100644
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -96,7 +96,7 @@ static const struct option options[] =
 static void
 usage (void)
 {
-  fprintf (stderr, _("Try `jv-scan --help' for more information.\n"));
+  fprintf (stderr, _("Try 'jv-scan --help' for more information.\n"));
   exit (1);
 }
 
@@ -108,7 +108,7 @@ help (void)
   printf (_("  --no-assert             Don't recognize the assert keyword\n"));
   printf (_("  --complexity            Print cyclomatic complexity of input file\n"));
   printf (_("  --encoding NAME         Specify encoding of input file\n"));
-  printf (_("  --print-main            Print name of class containing `main'\n"));
+  printf (_("  --print-main            Print name of class containing 'main'\n"));
   printf (_("  --list-class            List all classes defined in file\n"));
   printf (_("  --list-filename         Print input filename when listing class names\n"));
   printf (_("  -o FILE                 Set output file name\n"));
@@ -210,10 +210,10 @@ main (int argc, char **argv)
   /* Check on bad usage */
   if (flag_find_main + flag_dump_class + flag_complexity > 1)
     fatal_error
-      ("only one of `--print-main', `--list-class', and `--complexity' allowed");
+      ("only one of '--print-main', '--list-class', and '--complexity' allowed");
 
   if (output_file && !(out = fopen (output_file, "w")))
-    fatal_error ("can't open output file `%s'", output_file);
+    fatal_error ("can't open output file '%s'", output_file);
 
   ft = ftell (out);
 
@@ -248,7 +248,7 @@ main (int argc, char **argv)
 	    reset_report ();
 	  }
 	else
-	  fatal_error ("file not found `%s'", argv [i]);
+	  fatal_error ("file not found '%s'", argv [i]);
       }
 
   /* Flush and close */
diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index a3e8c6f..479916b 100644
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -414,13 +414,13 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
     }
 
   if (quote)
-    fatal ("argument to `%s' missing\n", quote);
+    fatal ("argument to '%s' missing\n", quote);
 
   if (saw_D && ! main_class_name)
-    fatal ("can't specify `-D' without `--main'\n");
+    fatal ("can't specify '-D' without '--main'\n");
 
   if (main_class_name && ! verify_class_name (main_class_name))
-    fatal ("`%s' is not a valid class name", main_class_name);
+    fatal ("'%s' is not a valid class name", main_class_name);
 
   num_args = argc + added;
   if (saw_resource)
@@ -531,7 +531,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
       if (strncmp (argv[i], "-fmain=", 7) == 0)
 	{
 	  if (! will_link)
-	    fatal ("cannot specify `main' class when not linking");
+	    fatal ("cannot specify 'main' class when not linking");
 	  --j;
 	  continue;
 	}