Silence compiler warnings from XML error macros.

This commit is contained in:
Kristian Høgsberg
2007-12-21 15:31:00 -05:00
parent 9136e1f2c8
commit 2f3e939ae7

View File

@@ -403,40 +403,40 @@ static GLboolean checkValue (const driOptionValue *v, const driOptionInfo *info)
/** \brief Output a warning message. */ /** \brief Output a warning message. */
#define XML_WARNING1(msg) do {\ #define XML_WARNING1(msg) do {\
__driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \ __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \
XML_GetCurrentLineNumber(data->parser), \ (int) XML_GetCurrentLineNumber(data->parser), \
XML_GetCurrentColumnNumber(data->parser)); \ (int) XML_GetCurrentColumnNumber(data->parser)); \
} while (0) } while (0)
#define XML_WARNING(msg,args...) do { \ #define XML_WARNING(msg,args...) do { \
__driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \ __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \
XML_GetCurrentLineNumber(data->parser), \ (int) XML_GetCurrentLineNumber(data->parser), \
XML_GetCurrentColumnNumber(data->parser), \ (int) XML_GetCurrentColumnNumber(data->parser), \
args); \ args); \
} while (0) } while (0)
/** \brief Output an error message. */ /** \brief Output an error message. */
#define XML_ERROR1(msg) do { \ #define XML_ERROR1(msg) do { \
__driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \ __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \
XML_GetCurrentLineNumber(data->parser), \ (int) XML_GetCurrentLineNumber(data->parser), \
XML_GetCurrentColumnNumber(data->parser)); \ (int) XML_GetCurrentColumnNumber(data->parser)); \
} while (0) } while (0)
#define XML_ERROR(msg,args...) do { \ #define XML_ERROR(msg,args...) do { \
__driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \ __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \
XML_GetCurrentLineNumber(data->parser), \ (int) XML_GetCurrentLineNumber(data->parser), \
XML_GetCurrentColumnNumber(data->parser), \ (int) XML_GetCurrentColumnNumber(data->parser), \
args); \ args); \
} while (0) } while (0)
/** \brief Output a fatal error message and abort. */ /** \brief Output a fatal error message and abort. */
#define XML_FATAL1(msg) do { \ #define XML_FATAL1(msg) do { \
fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \ fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \
data->name, \ data->name, \
XML_GetCurrentLineNumber(data->parser), \ (int) XML_GetCurrentLineNumber(data->parser), \
XML_GetCurrentColumnNumber(data->parser)); \ (int) XML_GetCurrentColumnNumber(data->parser)); \
abort();\ abort();\
} while (0) } while (0)
#define XML_FATAL(msg,args...) do { \ #define XML_FATAL(msg,args...) do { \
fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \ fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \
data->name, \ data->name, \
XML_GetCurrentLineNumber(data->parser), \ (int) XML_GetCurrentLineNumber(data->parser), \
XML_GetCurrentColumnNumber(data->parser), \ (int) XML_GetCurrentColumnNumber(data->parser), \
args); \ args); \
abort();\ abort();\
} while (0) } while (0)