gallium: fix a few bugs, warnings in the p_debug code
added missing _ to a _debug_printf() call.
This commit is contained in:
@@ -260,7 +260,7 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* Check for aborts enabled. */
|
/* Check for aborts enabled. */
|
||||||
static unsigned abort_en()
|
static unsigned abort_en(void)
|
||||||
{
|
{
|
||||||
if (!mapped_config_file)
|
if (!mapped_config_file)
|
||||||
{
|
{
|
||||||
@@ -283,7 +283,7 @@ static unsigned abort_en()
|
|||||||
return ((((char *)mapped_config_file)[0]) - 0x30) & eAssertAbortEn;
|
return ((((char *)mapped_config_file)[0]) - 0x30) & eAssertAbortEn;
|
||||||
}
|
}
|
||||||
#else /* WIN32 */
|
#else /* WIN32 */
|
||||||
static unsigned abort_en()
|
static unsigned abort_en(void)
|
||||||
{
|
{
|
||||||
return !GETENV("GALLIUM_ABORT_ON_ASSERT");
|
return !GETENV("GALLIUM_ABORT_ON_ASSERT");
|
||||||
}
|
}
|
||||||
|
@@ -63,7 +63,7 @@ extern "C" {
|
|||||||
void _debug_vprintf(const char *format, va_list ap);
|
void _debug_vprintf(const char *format, va_list ap);
|
||||||
|
|
||||||
|
|
||||||
static void INLINE
|
static INLINE void
|
||||||
_debug_printf(const char *format, ...)
|
_debug_printf(const char *format, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
@@ -82,7 +82,7 @@ _debug_printf(const char *format, ...)
|
|||||||
* - avoid outputing large strings (512 bytes is the current maximum length
|
* - avoid outputing large strings (512 bytes is the current maximum length
|
||||||
* that is guaranteed to be printed in all platforms)
|
* that is guaranteed to be printed in all platforms)
|
||||||
*/
|
*/
|
||||||
static void INLINE
|
static INLINE void
|
||||||
debug_printf(const char *format, ...)
|
debug_printf(const char *format, ...)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
@@ -133,6 +133,9 @@ void _debug_break(void);
|
|||||||
#endif /* !DEBUG */
|
#endif /* !DEBUG */
|
||||||
|
|
||||||
|
|
||||||
|
long
|
||||||
|
debug_get_num_option(const char *name, long dfault);
|
||||||
|
|
||||||
void _debug_assert_fail(const char *expr,
|
void _debug_assert_fail(const char *expr,
|
||||||
const char *file,
|
const char *file,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
@@ -176,7 +179,7 @@ void _debug_assert_fail(const char *expr,
|
|||||||
*/
|
*/
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
#define debug_checkpoint_full() \
|
#define debug_checkpoint_full() \
|
||||||
debug_printf("%s:%u:%s", __FILE__, __LINE__, __FUNCTION__)
|
_debug_printf("%s:%u:%s", __FILE__, __LINE__, __FUNCTION__)
|
||||||
#else
|
#else
|
||||||
#define debug_checkpoint_full() \
|
#define debug_checkpoint_full() \
|
||||||
((void)0)
|
((void)0)
|
||||||
|
Reference in New Issue
Block a user