OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/36161 (gfc_error formats are not marked gcc-internal-format in po file)

Browse Source 
2010-01-04  Tobias Burnus  <burnus@net-b.de>

        PR fortran/36161
        * error.c (error_printf, gfc_warning, gfc_notify_std,
        gfc_warning_now, gfc_error, gfc_error_now,
        gfc_fatal_error): Change argument name from nocmsgid to
        gmsgid to enable (x)gettext's % checking.

From-SVN: r155632
This commit is contained in:
Tobias Burnus 2010-01-04 22:01:10 +01:00 committed by Tobias Burnus
parent caee6ca1dc
commit d6de356aa3
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/fortran/ChangeLog
View File

@ -1,3 +1,11 @@
2010-01-04 Tobias Burnus <burnus@net-b.de>
PR fortran/36161
* error.c (error_printf, gfc_warning, gfc_notify_std,
gfc_warning_now, gfc_error, gfc_error_now,
gfc_fatal_error): Change argument name from nocmsgid to
gmsgid to enable (x)gettext's % checking.
2010-01-04 Tobias Burnus <burnus@net-b.de>
* trans-decl.c (gfc_trans_deferred_vars): Fix spelling.

48
gcc/fortran/error.c
View File

@ -697,12 +697,12 @@ error_print (const char *type, const char *format0, va_list argp)
/* Wrapper for error_print(). */
static void
error_printf (const char *nocmsgid, ...)
error_printf (const char *gmsgid, ...)
{
va_list argp;
va_start (argp, nocmsgid);
error_print ("", _(nocmsgid), argp);
va_start (argp, gmsgid);
error_print ("", _(gmsgid), argp);
va_end (argp);
}
@ -722,7 +722,7 @@ gfc_increment_error_count (void)
/* Issue a warning. */
void
gfc_warning (const char *nocmsgid, ...)
gfc_warning (const char *gmsgid, ...)
{
va_list argp;
@ -733,8 +733,8 @@ gfc_warning (const char *nocmsgid, ...)
warning_buffer.index = 0;
cur_error_buffer = &warning_buffer;
va_start (argp, nocmsgid);
error_print (_("Warning:"), _(nocmsgid), argp);
va_start (argp, gmsgid);
error_print (_("Warning:"), _(gmsgid), argp);
va_end (argp);
error_char ('\0');
@ -770,7 +770,7 @@ gfc_notification_std (int std)
an error is generated. */
gfc_try
gfc_notify_std (int std, const char *nocmsgid, ...)
gfc_notify_std (int std, const char *gmsgid, ...)
{
va_list argp;
bool warning;
@ -786,11 +786,11 @@ gfc_notify_std (int std, const char *nocmsgid, ...)
cur_error_buffer->flag = 1;
cur_error_buffer->index = 0;
va_start (argp, nocmsgid);
va_start (argp, gmsgid);
if (warning)
error_print (_("Warning:"), _(nocmsgid), argp);
error_print (_("Warning:"), _(gmsgid), argp);
else
error_print (_("Error:"), _(nocmsgid), argp);
error_print (_("Error:"), _(gmsgid), argp);
va_end (argp);
error_char ('\0');
@ -810,7 +810,7 @@ gfc_notify_std (int std, const char *nocmsgid, ...)
/* Immediate warning (i.e. do not buffer the warning). */
void
gfc_warning_now (const char *nocmsgid, ...)
gfc_warning_now (const char *gmsgid, ...)
{
va_list argp;
int i;
@ -822,8 +822,8 @@ gfc_warning_now (const char *nocmsgid, ...)
buffer_flag = 0;
warnings++;
va_start (argp, nocmsgid);
error_print (_("Warning:"), _(nocmsgid), argp);
va_start (argp, gmsgid);
error_print (_("Warning:"), _(gmsgid), argp);
va_end (argp);
error_char ('\0');
@ -863,7 +863,7 @@ gfc_warning_check (void)
/* Issue an error. */
void
gfc_error (const char *nocmsgid, ...)
gfc_error (const char *gmsgid, ...)
{
va_list argp;
@ -877,8 +877,8 @@ gfc_error (const char *nocmsgid, ...)
error_buffer.index = 0;
cur_error_buffer = &error_buffer;
va_start (argp, nocmsgid);
error_print (_("Error:"), _(nocmsgid), argp);
va_start (argp, gmsgid);
error_print (_("Error:"), _(gmsgid), argp);
va_end (argp);
error_char ('\0');
@ -897,8 +897,8 @@ warning:
warning_buffer.index = 0;
cur_error_buffer = &warning_buffer;
va_start (argp, nocmsgid);
error_print (_("Warning:"), _(nocmsgid), argp);
va_start (argp, gmsgid);
error_print (_("Warning:"), _(gmsgid), argp);
va_end (argp);
error_char ('\0');
@ -915,7 +915,7 @@ warning:
/* Immediate error. */
void
gfc_error_now (const char *nocmsgid, ...)
gfc_error_now (const char *gmsgid, ...)
{
va_list argp;
int i;
@ -927,8 +927,8 @@ gfc_error_now (const char *nocmsgid, ...)
i = buffer_flag;
buffer_flag = 0;
va_start (argp, nocmsgid);
error_print (_("Error:"), _(nocmsgid), argp);
va_start (argp, gmsgid);
error_print (_("Error:"), _(gmsgid), argp);
va_end (argp);
error_char ('\0');
@ -945,14 +945,14 @@ gfc_error_now (const char *nocmsgid, ...)
/* Fatal error, never returns. */
void
gfc_fatal_error (const char *nocmsgid, ...)
gfc_fatal_error (const char *gmsgid, ...)
{
va_list argp;
buffer_flag = 0;
va_start (argp, nocmsgid);
error_print (_("Fatal Error:"), _(nocmsgid), argp);
va_start (argp, gmsgid);
error_print (_("Fatal Error:"), _(gmsgid), argp);
va_end (argp);
exit (3);