Cleaned up the debugging functions slightly. Now to convert the other backends.
This commit is contained in:
parent
d52c92d2f8
commit
59eebb1e48
|
@ -3,6 +3,7 @@
|
||||||
CFILES += \
|
CFILES += \
|
||||||
common/areaevents.c \
|
common/areaevents.c \
|
||||||
common/control.c \
|
common/control.c \
|
||||||
|
common/debug.c \
|
||||||
common/matrix.c \
|
common/matrix.c \
|
||||||
common/shouldquit.c
|
common/shouldquit.c
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
// 13 may 2016
|
||||||
|
#include "../ui.h"
|
||||||
|
#include "uipriv.h"
|
||||||
|
|
||||||
|
void _implbug(const char *file, const char *line, const char *func, const char *format, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, format);
|
||||||
|
realbug(file, line, func, "POSSIBLE IMPLEMENTATION BUG; CONTACT ANDLABS:\n", format, ap);
|
||||||
|
va_end(ap);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _userbug(const char *file, const char *line, const char *func, const char *format, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, format);
|
||||||
|
realbug(file, line, func, "You have a bug: ", format, ap);
|
||||||
|
va_end(ap);
|
||||||
|
}
|
|
@ -3,6 +3,7 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
#include "controlsigs.h"
|
#include "controlsigs.h"
|
||||||
|
|
||||||
extern uiInitOptions options;
|
extern uiInitOptions options;
|
||||||
|
@ -12,6 +13,7 @@ extern void *uiAlloc(size_t, const char *);
|
||||||
extern void *uiRealloc(void *, size_t, const char *);
|
extern void *uiRealloc(void *, size_t, const char *);
|
||||||
extern void uiFree(void *);
|
extern void uiFree(void *);
|
||||||
|
|
||||||
|
extern void realbug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap);
|
||||||
#define _ns2(s) #s
|
#define _ns2(s) #s
|
||||||
#define _ns(s) _ns2(s)
|
#define _ns(s) _ns2(s)
|
||||||
extern void _implbug(const char *file, const char *line, const char *func, const char *format, ...);
|
extern void _implbug(const char *file, const char *line, const char *func, const char *format, ...);
|
||||||
|
|
|
@ -11,9 +11,9 @@ MFILES += \
|
||||||
darwin/combobox.m \
|
darwin/combobox.m \
|
||||||
darwin/control.m \
|
darwin/control.m \
|
||||||
darwin/datetimepicker.m \
|
darwin/datetimepicker.m \
|
||||||
|
darwin/debug.m \
|
||||||
darwin/draw.m \
|
darwin/draw.m \
|
||||||
darwin/drawtext.m \
|
darwin/drawtext.m \
|
||||||
darwin/debug.m \
|
|
||||||
darwin/entry.m \
|
darwin/entry.m \
|
||||||
darwin/fontbutton.m \
|
darwin/fontbutton.m \
|
||||||
darwin/group.m \
|
darwin/group.m \
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
// TODO don't halt on release builds
|
// TODO don't halt on release builds
|
||||||
|
|
||||||
static void bug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap)
|
void realbug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap)
|
||||||
{
|
{
|
||||||
NSMutableString *str;
|
NSMutableString *str;
|
||||||
NSString *formatted;
|
NSString *formatted;
|
||||||
|
@ -17,21 +17,3 @@ static void bug(const char *file, const char *line, const char *func, const char
|
||||||
[str release];
|
[str release];
|
||||||
__builtin_trap();
|
__builtin_trap();
|
||||||
}
|
}
|
||||||
|
|
||||||
void _implbug(const char *file, const char *line, const char *func, const char *format, ...)
|
|
||||||
{
|
|
||||||
va_list ap;
|
|
||||||
|
|
||||||
va_start(ap, format);
|
|
||||||
bug(file, line, func, "POSSIBLE IMPLEMENTATION BUG; CONTACT ANDLABS:\n", format, ap);
|
|
||||||
va_end(ap);
|
|
||||||
}
|
|
||||||
|
|
||||||
void _userbug(const char *file, const char *line, const char *func, const char *format, ...)
|
|
||||||
{
|
|
||||||
va_list ap;
|
|
||||||
|
|
||||||
va_start(ap, format);
|
|
||||||
bug(file, line, func, "You have a bug: ", format, ap);
|
|
||||||
va_end(ap);
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue