mirror of
https://github.com/yasm/yasm
synced 2026-08-26 22:26:05 -04:00
Add va_list versions of error and warning errwarn functions.
Required adding stdarg to util.h. svn path=/trunk/yasm/; revision=798
This commit is contained in:
Peter Johnson
parent
dd915a3eef
commit
86751029a3
7 changed files with 95 additions and 40 deletions
|
|
@ -219,24 +219,58 @@ errwarn_data_new(unsigned long lindex, int replace_parser_error)
|
|||
* for output_all() to print.
|
||||
*/
|
||||
static void
|
||||
yasm_errwarn_error(unsigned long lindex, const char *fmt, ...)
|
||||
yasm_errwarn_error_va(unsigned long lindex, const char *fmt, va_list va)
|
||||
{
|
||||
va_list va;
|
||||
errwarn_data *we = errwarn_data_new(lindex, 1);
|
||||
|
||||
we->type = WE_ERROR;
|
||||
|
||||
va_start(va, fmt);
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(we->msg, MSG_MAXSIZE, gettext(fmt), va);
|
||||
#else
|
||||
vsprintf(we->msg, gettext(fmt), va);
|
||||
#endif
|
||||
va_end(va);
|
||||
|
||||
error_count++;
|
||||
}
|
||||
|
||||
/* Register an warning at line lindex. Does not print the warning, only stores
|
||||
* it for output_all() to print.
|
||||
*/
|
||||
static void
|
||||
yasm_errwarn_warning_va(warn_class_num num, unsigned long lindex,
|
||||
const char *fmt, va_list va)
|
||||
{
|
||||
errwarn_data *we;
|
||||
|
||||
if (!(warn_class_enabled & (1UL<<num)))
|
||||
return; /* warning is part of disabled class */
|
||||
|
||||
we = errwarn_data_new(lindex, 0);
|
||||
|
||||
we->type = WE_WARNING;
|
||||
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(we->msg, MSG_MAXSIZE, gettext(fmt), va);
|
||||
#else
|
||||
vsprintf(we->msg, gettext(fmt), va);
|
||||
#endif
|
||||
|
||||
warning_count++;
|
||||
}
|
||||
|
||||
/* Register an error at line lindex. Does not print the error, only stores it
|
||||
* for output_all() to print.
|
||||
*/
|
||||
static void
|
||||
yasm_errwarn_error(unsigned long lindex, const char *fmt, ...)
|
||||
{
|
||||
va_list va;
|
||||
va_start(va, fmt);
|
||||
yasm_errwarn_error_va(lindex, fmt, va);
|
||||
va_end(va);
|
||||
}
|
||||
|
||||
/* Register an warning at line lindex. Does not print the warning, only stores
|
||||
* it for output_all() to print.
|
||||
*/
|
||||
|
|
@ -245,24 +279,9 @@ yasm_errwarn_warning(warn_class_num num, unsigned long lindex, const char *fmt,
|
|||
...)
|
||||
{
|
||||
va_list va;
|
||||
errwarn_data *we;
|
||||
|
||||
if (!(warn_class_enabled & (1UL<<num)))
|
||||
return; /* warning is part of disabled class */
|
||||
|
||||
we = errwarn_data_new(lindex, 0);
|
||||
|
||||
we->type = WE_WARNING;
|
||||
|
||||
va_start(va, fmt);
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(we->msg, MSG_MAXSIZE, gettext(fmt), va);
|
||||
#else
|
||||
vsprintf(we->msg, gettext(fmt), va);
|
||||
#endif
|
||||
yasm_errwarn_warning_va(num, lindex, fmt, va);
|
||||
va_end(va);
|
||||
|
||||
warning_count++;
|
||||
}
|
||||
|
||||
/* Parser error handler. Moves YACC-style error into our error handling
|
||||
|
|
@ -336,6 +355,8 @@ errwarn yasm_errwarn = {
|
|||
yasm_errwarn_cleanup,
|
||||
yasm_errwarn_internal_error_,
|
||||
yasm_errwarn_fatal,
|
||||
yasm_errwarn_error_va,
|
||||
yasm_errwarn_warning_va,
|
||||
yasm_errwarn_error,
|
||||
yasm_errwarn_warning,
|
||||
yasm_errwarn_parser_error,
|
||||
|
|
|
|||
|
|
@ -58,6 +58,11 @@ struct errwarn {
|
|||
*/
|
||||
/*@exits@*/ void (*fatal) (fatal_num);
|
||||
|
||||
/* va_list versions of the below two functions */
|
||||
void (*error_va) (unsigned long lindex, const char *, va_list va);
|
||||
void (*warning_va) (warn_class_num, unsigned long lindex, const char *,
|
||||
va_list va);
|
||||
|
||||
void (*error) (unsigned long lindex, const char *, ...) /*@printflike@*/;
|
||||
void (*warning) (warn_class_num, unsigned long lindex, const char *, ...)
|
||||
/*@printflike@*/;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
# include <stdlib.h>
|
||||
# include <string.h>
|
||||
# include <assert.h>
|
||||
# include <stdarg.h>
|
||||
#endif
|
||||
|
||||
#if defined(lint)
|
||||
|
|
|
|||
|
|
@ -219,24 +219,58 @@ errwarn_data_new(unsigned long lindex, int replace_parser_error)
|
|||
* for output_all() to print.
|
||||
*/
|
||||
static void
|
||||
yasm_errwarn_error(unsigned long lindex, const char *fmt, ...)
|
||||
yasm_errwarn_error_va(unsigned long lindex, const char *fmt, va_list va)
|
||||
{
|
||||
va_list va;
|
||||
errwarn_data *we = errwarn_data_new(lindex, 1);
|
||||
|
||||
we->type = WE_ERROR;
|
||||
|
||||
va_start(va, fmt);
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(we->msg, MSG_MAXSIZE, gettext(fmt), va);
|
||||
#else
|
||||
vsprintf(we->msg, gettext(fmt), va);
|
||||
#endif
|
||||
va_end(va);
|
||||
|
||||
error_count++;
|
||||
}
|
||||
|
||||
/* Register an warning at line lindex. Does not print the warning, only stores
|
||||
* it for output_all() to print.
|
||||
*/
|
||||
static void
|
||||
yasm_errwarn_warning_va(warn_class_num num, unsigned long lindex,
|
||||
const char *fmt, va_list va)
|
||||
{
|
||||
errwarn_data *we;
|
||||
|
||||
if (!(warn_class_enabled & (1UL<<num)))
|
||||
return; /* warning is part of disabled class */
|
||||
|
||||
we = errwarn_data_new(lindex, 0);
|
||||
|
||||
we->type = WE_WARNING;
|
||||
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(we->msg, MSG_MAXSIZE, gettext(fmt), va);
|
||||
#else
|
||||
vsprintf(we->msg, gettext(fmt), va);
|
||||
#endif
|
||||
|
||||
warning_count++;
|
||||
}
|
||||
|
||||
/* Register an error at line lindex. Does not print the error, only stores it
|
||||
* for output_all() to print.
|
||||
*/
|
||||
static void
|
||||
yasm_errwarn_error(unsigned long lindex, const char *fmt, ...)
|
||||
{
|
||||
va_list va;
|
||||
va_start(va, fmt);
|
||||
yasm_errwarn_error_va(lindex, fmt, va);
|
||||
va_end(va);
|
||||
}
|
||||
|
||||
/* Register an warning at line lindex. Does not print the warning, only stores
|
||||
* it for output_all() to print.
|
||||
*/
|
||||
|
|
@ -245,24 +279,9 @@ yasm_errwarn_warning(warn_class_num num, unsigned long lindex, const char *fmt,
|
|||
...)
|
||||
{
|
||||
va_list va;
|
||||
errwarn_data *we;
|
||||
|
||||
if (!(warn_class_enabled & (1UL<<num)))
|
||||
return; /* warning is part of disabled class */
|
||||
|
||||
we = errwarn_data_new(lindex, 0);
|
||||
|
||||
we->type = WE_WARNING;
|
||||
|
||||
va_start(va, fmt);
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(we->msg, MSG_MAXSIZE, gettext(fmt), va);
|
||||
#else
|
||||
vsprintf(we->msg, gettext(fmt), va);
|
||||
#endif
|
||||
yasm_errwarn_warning_va(num, lindex, fmt, va);
|
||||
va_end(va);
|
||||
|
||||
warning_count++;
|
||||
}
|
||||
|
||||
/* Parser error handler. Moves YACC-style error into our error handling
|
||||
|
|
@ -336,6 +355,8 @@ errwarn yasm_errwarn = {
|
|||
yasm_errwarn_cleanup,
|
||||
yasm_errwarn_internal_error_,
|
||||
yasm_errwarn_fatal,
|
||||
yasm_errwarn_error_va,
|
||||
yasm_errwarn_warning_va,
|
||||
yasm_errwarn_error,
|
||||
yasm_errwarn_warning,
|
||||
yasm_errwarn_parser_error,
|
||||
|
|
|
|||
|
|
@ -58,6 +58,11 @@ struct errwarn {
|
|||
*/
|
||||
/*@exits@*/ void (*fatal) (fatal_num);
|
||||
|
||||
/* va_list versions of the below two functions */
|
||||
void (*error_va) (unsigned long lindex, const char *, va_list va);
|
||||
void (*warning_va) (warn_class_num, unsigned long lindex, const char *,
|
||||
va_list va);
|
||||
|
||||
void (*error) (unsigned long lindex, const char *, ...) /*@printflike@*/;
|
||||
void (*warning) (warn_class_num, unsigned long lindex, const char *, ...)
|
||||
/*@printflike@*/;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
# include <stdlib.h>
|
||||
# include <string.h>
|
||||
# include <assert.h>
|
||||
# include <stdarg.h>
|
||||
#endif
|
||||
|
||||
#if defined(lint)
|
||||
|
|
|
|||
1
util.h
1
util.h
|
|
@ -47,6 +47,7 @@
|
|||
# include <stdlib.h>
|
||||
# include <string.h>
|
||||
# include <assert.h>
|
||||
# include <stdarg.h>
|
||||
#endif
|
||||
|
||||
#if defined(lint)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue