Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / diagnostic.c

diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 2af8e12..1b40462 100644 (file)
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -78,7 +78,7 @@ static void notice PARAMS ((const char *s, ...)) ATTRIBUTE_PRINTF_1;
 static void v_message_with_file_and_line PARAMS ((const char *, int, int,
                                                  const char *, va_list));
 static void v_message_with_decl PARAMS ((tree, int, const char *, va_list));
-static void file_and_line_for_asm PARAMS ((rtx, char **, int *));
+static void file_and_line_for_asm PARAMS ((rtx, const char **, int *));
 static void v_error_with_file_and_line PARAMS ((const char *, int,
                                                const char *, va_list));
 static void v_error_with_decl PARAMS ((tree, const char *, va_list));
@@ -122,7 +122,7 @@ void (*print_error_function) PARAMS ((const char *)) =
   default_print_error_function;
 
 /* Maximum characters per line in automatic line wrapping mode.
-   Non Zero means don't wrap lines. */
+   Zero means don't wrap lines. */
 
 static int output_maximum_width = 0;
 \f
@@ -152,7 +152,7 @@ init_output_buffer (buffer, prefix, max_length)
      char *prefix;
      int max_length;
 {
-  int prefix_length = strlen (prefix);
+  int prefix_length = prefix == 0 ? 0 : strlen (prefix);
 
   obstack_init (&buffer->obstack);
   buffer->prefix = prefix;
@@ -574,7 +574,7 @@ v_message_with_decl (decl, warn, msgid, ap)
 static void
 file_and_line_for_asm (insn, pfile, pline)
      rtx insn;
-     char **pfile;
+     const char **pfile;
      int *pline;
 {
   rtx body = PATTERN (insn);
@@ -649,7 +649,7 @@ v_error_for_asm (insn, msgid, ap)
      const char *msgid;
      va_list ap;
 {
-  char *file;
+  const char *file;
   int line;
 
   count_error (0);
@@ -737,7 +737,7 @@ v_warning_for_asm (insn, msgid, ap)
 {
   if (count_error (1))
     {
-      char *file;
+      const char *file;
       int line;
 
       file_and_line_for_asm (insn, &file, &line);