diff options
author | Joseph Myers <joseph@codesourcery.com> | 2004-11-09 10:13:30 +0000 |
---|---|---|
committer | Joseph Myers <jsm28@gcc.gnu.org> | 2004-11-09 10:13:30 +0000 |
commit | 9e637a26797c8ffa178974764874683f12b12d4d (patch) | |
tree | 7a8b42664cab7c57c0140be05c05db9dedb5add4 /gcc/protoize.c | |
parent | 55a9c4b2fce38ae2459976fa912cd77071f77f4b (diff) | |
download | gcc-9e637a26797c8ffa178974764874683f12b12d4d.zip gcc-9e637a26797c8ffa178974764874683f12b12d4d.tar.gz gcc-9e637a26797c8ffa178974764874683f12b12d4d.tar.bz2 |
builtins.c, [...]: Avoid "`" as left quote, using "'" or %q, %< and %> as appropriate.
* builtins.c, c-common.c, c-decl.c, c-format.c, c-format.h,
c-parse.in, c-pch.c, c-pragma.c, collect2.c, final.c, gcc.c,
gcov.c, opts.c, pretty-print.h, protoize.c, reg-stack.c, rtl.c,
tlink.c, config/alpha/alpha.c, config/arc/arc.c, config/arm/arm.c,
config/avr/avr.c, config/c4x/c4x.c, config/darwin.c,
config/frv/frv.c, config/h8300/h8300.c, config/i386/i386.c,
config/i386/winnt.c, config/ia64/ia64.c, config/ip2k/ip2k.c,
config/iq2000/iq2000.c, config/m32r/m32r.c,
config/m68hc11/m68hc11.c, config/m68k/m68k.c, config/m68k/m68k.h,
config/mcore/mcore.c, config/mips/mips.c, config/mmix/mmix.c,
config/ns32k/ns32k.c, config/rs6000/host-darwin.c,
config/rs6000/rs6000.c, config/s390/s390.c, config/sh/sh.c,
config/sh/symbian.c, config/stormy16/stormy16.c,
config/v850/v850.c: Avoid "`" as left quote, using "'" or %q, %<
and %> as appropriate. Use %' as apostrophe in diagnostics where
applicable. Use %< and %> in place of '' quotes where applicable.
Use %qs in place of %<%s%>. Consistently quote __builtin function
names.
ada:
* misc.c (gnat_handle_option): Use %< and %> for quoting in
warning message.
cp:
* call.c, class.c, decl.c, decl2.c, error.c, mangle.c, parser.c,
pt.c, search.c, semantics.c, typeck.c: Use %q, %< and %> for
quoting in diagnostics.
* parser.c (cp_parser_sizeof_operand): Use '' instead of `' for
quoting in printf format.
* decl.c (duplicate_decls, start_decl): Use %qD instead of
unquoted %D.
objc:
* objc-act.c: Use %q, %< and %> for quoting in diagnostics.
testsuite:
* gcc.dg/builtin-prefetch-1.c: Adjust expected messages.
From-SVN: r90337
Diffstat (limited to 'gcc/protoize.c')
-rw-r--r-- | gcc/protoize.c | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/gcc/protoize.c b/gcc/protoize.c index 7573432..093e440 100644 --- a/gcc/protoize.c +++ b/gcc/protoize.c @@ -579,7 +579,7 @@ safe_write (int desc, void *ptr, int len, const char *out_fname) if (errno_val == EINTR) continue; #endif - notice ("%s: error writing file `%s': %s\n", + notice ("%s: error writing file '%s': %s\n", pname, shortpath (NULL, out_fname), xstrerror (errno_val)); return; } @@ -732,7 +732,7 @@ file_normally_convertible (const char *path) if (access (path, R_OK)) { if (!quiet_flag) - notice ("%s: warning: no read access for file `%s'\n", + notice ("%s: warning: no read access for file '%s'\n", pname, shortpath (NULL, path)); return 0; } @@ -740,7 +740,7 @@ file_normally_convertible (const char *path) if (access (path, W_OK)) { if (!quiet_flag) - notice ("%s: warning: no write access for file `%s'\n", + notice ("%s: warning: no write access for file '%s'\n", pname, shortpath (NULL, path)); return 0; } @@ -748,7 +748,7 @@ file_normally_convertible (const char *path) if (access (dir_name, W_OK)) { if (!quiet_flag) - notice ("%s: warning: no write access for dir containing `%s'\n", + notice ("%s: warning: no write access for dir containing '%s'\n", pname, shortpath (NULL, path)); return 0; } @@ -1633,7 +1633,7 @@ save_def_or_dec (const char *l, int is_syscalls) { if (strcmp (def_dec_p->ansi_decl, other->ansi_decl)) { - notice ("%s:%d: declaration of function `%s' takes different forms\n", + notice ("%s:%d: declaration of function '%s' takes different forms\n", def_dec_p->file->hash_entry->symbol, def_dec_p->line, def_dec_p->hash_entry->symbol); @@ -1888,7 +1888,7 @@ gen_aux_info_file (const char *base_filename) concat (compile_params[input_file_name_index], aux_info_suffix, NULL); if (!quiet_flag) - notice ("%s: compiling `%s'\n", + notice ("%s: compiling '%s'\n", pname, compile_params[input_file_name_index]); { @@ -1973,7 +1973,7 @@ start_over: ; { if (is_syscalls) { - notice ("%s: warning: missing SYSCALLS file `%s'\n", + notice ("%s: warning: missing SYSCALLS file '%s'\n", pname, aux_info_filename); return; } @@ -1982,7 +1982,7 @@ start_over: ; else { int errno_val = errno; - notice ("%s: can't read aux info file `%s': %s\n", + notice ("%s: can't read aux info file '%s': %s\n", pname, shortpath (NULL, aux_info_filename), xstrerror (errno_val)); errors++; @@ -2011,7 +2011,7 @@ start_over: ; if (access (aux_info_filename, R_OK) == -1) { int errno_val = errno; - notice ("%s: can't read aux info file `%s': %s\n", + notice ("%s: can't read aux info file '%s': %s\n", pname, shortpath (NULL, aux_info_filename), xstrerror (errno_val)); errors++; @@ -2027,7 +2027,7 @@ start_over: ; if (stat (aux_info_filename, &stat_buf) == -1) { int errno_val = errno; - notice ("%s: can't get status of aux info file `%s': %s\n", + notice ("%s: can't get status of aux info file '%s': %s\n", pname, shortpath (NULL, aux_info_filename), xstrerror (errno_val)); errors++; @@ -2055,7 +2055,7 @@ start_over: ; if (stat (base_source_filename, &stat_buf) == -1) { int errno_val = errno; - notice ("%s: can't get status of aux info file `%s': %s\n", + notice ("%s: can't get status of aux info file '%s': %s\n", pname, shortpath (NULL, base_source_filename), xstrerror (errno_val)); errors++; @@ -2083,7 +2083,7 @@ start_over: ; if ((aux_info_file = open (aux_info_filename, fd_flags, 0444 )) == -1) { int errno_val = errno; - notice ("%s: can't open aux info file `%s' for reading: %s\n", + notice ("%s: can't open aux info file '%s' for reading: %s\n", pname, shortpath (NULL, aux_info_filename), xstrerror (errno_val)); return; @@ -2101,7 +2101,7 @@ start_over: ; (int) aux_info_size) { int errno_val = errno; - notice ("%s: error reading aux info file `%s': %s\n", + notice ("%s: error reading aux info file '%s': %s\n", pname, shortpath (NULL, aux_info_filename), xstrerror (errno_val)); free (aux_info_base); @@ -2114,7 +2114,7 @@ start_over: ; if (close (aux_info_file)) { int errno_val = errno; - notice ("%s: error closing aux info file `%s': %s\n", + notice ("%s: error closing aux info file '%s': %s\n", pname, shortpath (NULL, aux_info_filename), xstrerror (errno_val)); free (aux_info_base); @@ -2130,7 +2130,7 @@ start_over: ; if (unlink (aux_info_filename) == -1) { int errno_val = errno; - notice ("%s: can't delete aux info file `%s': %s\n", + notice ("%s: can't delete aux info file '%s': %s\n", pname, shortpath (NULL, aux_info_filename), xstrerror (errno_val)); } @@ -2212,7 +2212,7 @@ start_over: ; if (keep_it && unlink (aux_info_filename) == -1) { int errno_val = errno; - notice ("%s: can't delete file `%s': %s\n", + notice ("%s: can't delete file '%s': %s\n", pname, shortpath (NULL, aux_info_filename), xstrerror (errno_val)); return; @@ -2290,7 +2290,7 @@ rename_c_file (const hash_table_entry *hp) if (rename (filename, new_filename) == -1) { int errno_val = errno; - notice ("%s: warning: can't rename file `%s' to `%s': %s\n", + notice ("%s: warning: can't rename file '%s' to '%s': %s\n", pname, shortpath (NULL, filename), shortpath (NULL, new_filename), xstrerror (errno_val)); errors++; @@ -2451,7 +2451,7 @@ find_extern_def (const def_dec_info *head, const def_dec_info *user) { extern_def_p = dd_p; /* save a pointer to the definition */ if (!quiet_flag) - notice ("%s: warning: using formals list from %s(%d) for function `%s'\n", + notice ("%s: warning: using formals list from %s(%d) for function '%s'\n", pname, shortpath (NULL, dd_p->file->hash_entry->symbol), dd_p->line, dd_p->hash_entry->symbol); @@ -2491,13 +2491,13 @@ find_extern_def (const def_dec_info *head, const def_dec_info *user) *p++ = '?'; strcpy (p, ");"); - notice ("%s: %d: `%s' used but missing from SYSCALLS\n", + notice ("%s: %d: '%s' used but missing from SYSCALLS\n", shortpath (NULL, file), user->line, needed+7); /* Don't print "extern " */ } #if 0 else - notice ("%s: %d: warning: no extern definition for `%s'\n", + notice ("%s: %d: warning: no extern definition for '%s'\n", shortpath (NULL, file), user->line, user->hash_entry->symbol); #endif @@ -2527,13 +2527,13 @@ find_static_definition (const def_dec_info *user) if (num_static_defs == 0) { if (!quiet_flag) - notice ("%s: warning: no static definition for `%s' in file `%s'\n", + notice ("%s: warning: no static definition for '%s' in file '%s'\n", pname, head->hash_entry->symbol, shortpath (NULL, user->file->hash_entry->symbol)); } else if (num_static_defs > 1) { - notice ("%s: multiple static defs of `%s' in file `%s'\n", + notice ("%s: multiple static defs of '%s' in file '%s'\n", pname, head->hash_entry->symbol, shortpath (NULL, user->file->hash_entry->symbol)); return NULL; @@ -2917,7 +2917,7 @@ edit_fn_declaration (const def_dec_info *def_dec_p, if (setjmp (source_confusion_recovery)) { restore_pointers (); - notice ("%s: declaration of function `%s' not converted\n", + notice ("%s: declaration of function '%s' not converted\n", pname, function_to_edit); return; } @@ -3040,7 +3040,7 @@ edit_fn_declaration (const def_dec_info *def_dec_p, else { if (!quiet_flag) - notice ("%s: warning: too many parameter lists in declaration of `%s'\n", + notice ("%s: warning: too many parameter lists in declaration of '%s'\n", pname, def_dec_p->hash_entry->symbol); check_source (0, end_formals); /* leave the declaration intact */ } @@ -3061,7 +3061,7 @@ edit_fn_declaration (const def_dec_info *def_dec_p, if (this_f_list_chain_item) { if (!quiet_flag) - notice ("\n%s: warning: too few parameter lists in declaration of `%s'\n", + notice ("\n%s: warning: too few parameter lists in declaration of '%s'\n", pname, def_dec_p->hash_entry->symbol); check_source (0, start_formals); /* leave the decl intact */ } @@ -3157,7 +3157,7 @@ edit_formals_lists (const char *end_formals, unsigned int f_list_count, if (func_name_len != strlen (expected) || strncmp (func_name_start, expected, func_name_len)) { - notice ("%s: %d: warning: found `%s' but expected `%s'\n", + notice ("%s: %d: warning: found '%s' but expected '%s'\n", shortpath (NULL, def_dec_p->file->hash_entry->symbol), identify_lineno (func_name_start), dupnstr (func_name_start, func_name_len), @@ -3332,7 +3332,7 @@ add_local_decl (const def_dec_info *def_dec_p, const char *clean_text_p) if (setjmp (source_confusion_recovery)) { restore_pointers (); - notice ("%s: local declaration for function `%s' not inserted\n", + notice ("%s: local declaration for function '%s' not inserted\n", pname, function_to_edit); return; } @@ -3359,7 +3359,7 @@ add_local_decl (const def_dec_info *def_dec_p, const char *clean_text_p) if (*start_of_block != '{') { if (!quiet_flag) - notice ("\n%s: %d: warning: can't add declaration of `%s' into macro call\n", + notice ("\n%s: %d: warning: can't add declaration of '%s' into macro call\n", def_dec_p->file->hash_entry->symbol, def_dec_p->line, def_dec_p->hash_entry->symbol); return; @@ -3431,7 +3431,7 @@ add_global_decls (const file_info *file_p, const char *clean_text_p) if (setjmp (source_confusion_recovery)) { restore_pointers (); - notice ("%s: global declarations for file `%s' not inserted\n", + notice ("%s: global declarations for file '%s' not inserted\n", pname, shortpath (NULL, file_p->hash_entry->symbol)); return; } @@ -3520,7 +3520,7 @@ edit_fn_definition (const def_dec_info *def_dec_p, const char *clean_text_p) if (setjmp (source_confusion_recovery)) { restore_pointers (); - notice ("%s: definition of function `%s' not converted\n", + notice ("%s: definition of function '%s' not converted\n", pname, function_to_edit); return; } @@ -3550,7 +3550,7 @@ edit_fn_definition (const def_dec_info *def_dec_p, const char *clean_text_p) if (edit_formals_lists (end_formals, def_dec_p->f_list_count, def_dec_p)) { restore_pointers (); - notice ("%s: definition of function `%s' not converted\n", + notice ("%s: definition of function '%s' not converted\n", pname, function_to_edit); return; } @@ -3865,7 +3865,7 @@ scan_for_missed_items (const file_info *file_p) goto not_missed; #if 0 - notice ("%s: found definition of `%s' at %s(%d)\n", + notice ("%s: found definition of '%s' at %s(%d)\n", pname, func_name, shortpath (NULL, file_p->hash_entry->symbol), @@ -3881,7 +3881,7 @@ scan_for_missed_items (const file_info *file_p) /* If we make it here, then we did not know about this function definition. */ - notice ("%s: %d: warning: `%s' excluded by preprocessing\n", + notice ("%s: %d: warning: '%s' excluded by preprocessing\n", shortpath (NULL, file_p->hash_entry->symbol), identify_lineno (id_start), func_name); notice ("%s: function definition not converted\n", @@ -3942,7 +3942,7 @@ edit_file (const hash_table_entry *hp) && !in_system_include_dir (convert_filename) #endif /* defined (UNPROTOIZE) */ ) - notice ("%s: `%s' not converted\n", + notice ("%s: '%s' not converted\n", pname, shortpath (NULL, convert_filename)); return; } @@ -3950,10 +3950,10 @@ edit_file (const hash_table_entry *hp) /* Let the user know what we are up to. */ if (nochange_flag) - notice ("%s: would convert file `%s'\n", + notice ("%s: would convert file '%s'\n", pname, shortpath (NULL, convert_filename)); else - notice ("%s: converting file `%s'\n", + notice ("%s: converting file '%s'\n", pname, shortpath (NULL, convert_filename)); fflush (stderr); @@ -3963,7 +3963,7 @@ edit_file (const hash_table_entry *hp) if (stat (convert_filename, &stat_buf) == -1) { int errno_val = errno; - notice ("%s: can't get status for file `%s': %s\n", + notice ("%s: can't get status for file '%s': %s\n", pname, shortpath (NULL, convert_filename), xstrerror (errno_val)); return; @@ -4005,7 +4005,7 @@ edit_file (const hash_table_entry *hp) if ((input_file = open (convert_filename, fd_flags, 0444)) == -1) { int errno_val = errno; - notice ("%s: can't open file `%s' for reading: %s\n", + notice ("%s: can't open file '%s' for reading: %s\n", pname, shortpath (NULL, convert_filename), xstrerror (errno_val)); return; @@ -4020,7 +4020,7 @@ edit_file (const hash_table_entry *hp) { int errno_val = errno; close (input_file); - notice ("\n%s: error reading input file `%s': %s\n", + notice ("\n%s: error reading input file '%s': %s\n", pname, shortpath (NULL, convert_filename), xstrerror (errno_val)); return; @@ -4054,7 +4054,7 @@ edit_file (const hash_table_entry *hp) if ((clean_file = creat (clean_filename, 0666)) == -1) { int errno_val = errno; - notice ("%s: can't create/open clean file `%s': %s\n", + notice ("%s: can't create/open clean file '%s': %s\n", pname, shortpath (NULL, clean_filename), xstrerror (errno_val)); return; @@ -4159,7 +4159,7 @@ edit_file (const hash_table_entry *hp) if (access (new_filename, F_OK) == 0) { if (!quiet_flag) - notice ("%s: warning: file `%s' already saved in `%s'\n", + notice ("%s: warning: file '%s' already saved in '%s'\n", pname, shortpath (NULL, convert_filename), shortpath (NULL, new_filename)); @@ -4167,7 +4167,7 @@ edit_file (const hash_table_entry *hp) else if (rename (convert_filename, new_filename) == -1) { int errno_val = errno; - notice ("%s: can't link file `%s' to `%s': %s\n", + notice ("%s: can't link file '%s' to '%s': %s\n", pname, shortpath (NULL, convert_filename), shortpath (NULL, new_filename), @@ -4182,7 +4182,7 @@ edit_file (const hash_table_entry *hp) /* The file may have already been renamed. */ if (errno_val != ENOENT) { - notice ("%s: can't delete file `%s': %s\n", + notice ("%s: can't delete file '%s': %s\n", pname, shortpath (NULL, convert_filename), xstrerror (errno_val)); return; @@ -4197,7 +4197,7 @@ edit_file (const hash_table_entry *hp) if ((output_file = creat (convert_filename, 0666)) == -1) { int errno_val = errno; - notice ("%s: can't create/open output file `%s': %s\n", + notice ("%s: can't create/open output file '%s': %s\n", pname, shortpath (NULL, convert_filename), xstrerror (errno_val)); return; @@ -4230,7 +4230,7 @@ edit_file (const hash_table_entry *hp) if (chmod (convert_filename, stat_buf.st_mode) == -1) { int errno_val = errno; - notice ("%s: can't change mode of file `%s': %s\n", + notice ("%s: can't change mode of file '%s': %s\n", pname, shortpath (NULL, convert_filename), xstrerror (errno_val)); } |