From a4f9d082815871231d056ded1c2296c788b09606 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 13 May 2016 18:27:08 -0400 Subject: [PATCH] Began replacing complain() with the more appropriate implbug() and userbug(). --- common/uipriv.h | 5 ++++- windows/uipriv_windows.hpp | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/uipriv.h b/common/uipriv.h index 37496384..8bffda4e 100644 --- a/common/uipriv.h +++ b/common/uipriv.h @@ -12,7 +12,10 @@ extern void *uiAlloc(size_t, const char *); extern void *uiRealloc(void *, size_t, const char *); extern void uiFree(void *); -extern void complain(const char *, ...); +extern void _implbug(const char *file, const char *line, const char *func, const char *format, ...); +#define implbug(...) _implbug(__FILE__, #__LINE__, __func__, __VA_ARGS__) +extern void _userbug(const char *file, const char *line, const char *func, const char *format, ...); +#define userbug(...) _implbug(__FILE__, #__LINE__, __func__, __VA_ARGS__) // control.c extern uiControl *newControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typenamestr); diff --git a/windows/uipriv_windows.hpp b/windows/uipriv_windows.hpp index 984ed0af..4f66bea5 100644 --- a/windows/uipriv_windows.hpp +++ b/windows/uipriv_windows.hpp @@ -53,8 +53,6 @@ extern HRESULT _logLastError(debugargs, const WCHAR *s); #define logLastError(s) _logLastError(_ws(__FILE__), _wsn(__LINE__), _ws(__FUNCTION__), s) extern HRESULT _logHRESULT(debugargs, const WCHAR *s, HRESULT hr); #define logHRESULT(s, hr) _logHRESULT(_ws(__FILE__), _wsn(__LINE__), _ws(__FUNCTION__), s, hr) -extern void _implbug(debugargs, const WCHAR *format, ...); -#define implbug(...) _implbug(_ws(__FILE__), _wsn(__LINE__), _ws(__FUNCTION__), __VA_ARGS__) // winutil.cpp extern int windowClassOf(HWND hwnd, ...);