interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Started restructuring common/errors.c to only produce a single error string (so we can pass it to Haiku's debugger() function without further allocations). In this case, the buffer size is 256 + the size of the prefix + the size of the suffix now.

This commit is contained in:
Pietro Gagliardi 2020-02-09 18:27:19 -05:00
parent 83129eeef5
commit 44e13e53bf
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/errors.c
View File

@ -2,22 +2,27 @@
#include "uipriv.h" #include "uipriv.h"
#include "testhooks.h" #include "testhooks.h"
#define maxErrorBuf 256
#define conststrlen(s) ((sizeof (s) / sizeof (char)) - 1)
#define errorBufSize(prefix, suffix) (conststrlen(prefix) + maxErrorBuf + conststrlen(suffix) + 1)
#define internalErrorPrefix "libui internal error" #define internalErrorPrefix "libui internal error"
// TODO add debugging advice? // TODO add debugging advice?
#define internalErrorSuffix "This likely means there is a bug in libui itself. Contact the libui authors." #define internalErrorSuffix "This likely means there is a bug in libui itself. Contact the libui authors."
#define internalErrorBufSize errorBufSize(internalErrorPrefix, internalErrorSuffix)
void uiprivInternalError(const char *fmt, ...) void uiprivInternalError(const char *fmt, ...)
{ {
va_list ap; va_list ap;
char buf[256]; char buf[internalErrorBufSize];
int n; int n;
va_start(ap, fmt); va_start(ap, fmt);
n = uiprivVsnprintf(buf, 256, fmt, ap); n = uiprivVsnprintf(buf, internalErrorBufSize, fmt, ap);
va_end(ap); va_end(ap);
if (n < 0) if (n < 0)
uiprivReportError(internalErrorPrefix, "internal error string has encoding error", internalErrorSuffix, true); uiprivReportError(internalErrorPrefix, "internal error string has encoding error", internalErrorSuffix, true);
if (n >= 256) if (n >= internalErrorBufSize)
uiprivReportError(internalErrorPrefix, "internal error string too long", internalErrorSuffix, true); uiprivReportError(internalErrorPrefix, "internal error string too long", internalErrorSuffix, true);
uiprivReportError(internalErrorPrefix, buf, internalErrorSuffix, true); uiprivReportError(internalErrorPrefix, buf, internalErrorSuffix, true);
} }
@ -25,6 +30,7 @@ void uiprivInternalError(const char *fmt, ...)
#define programmerErrorPrefix "libui programmer error" #define programmerErrorPrefix "libui programmer error"
// TODO add debugging advice? // TODO add debugging advice?
#define programmerErrorSuffix "This likely means you are using libui incorrectly. Check your source code and try again. If you have received this warning in error, contact the libui authors." #define programmerErrorSuffix "This likely means you are using libui incorrectly. Check your source code and try again. If you have received this warning in error, contact the libui authors."
#define programmerErrorBufSize errorBufSize(programmerErrorPrefix, programmerErrorSuffix)
static uiprivTestHookReportProgrammerErrorFunc reportProgrammerErrorTestHook = NULL; static uiprivTestHookReportProgrammerErrorFunc reportProgrammerErrorTestHook = NULL;
static void *reportProgrammerErrorTestHookData = NULL; static void *reportProgrammerErrorTestHookData = NULL;
@ -38,14 +44,14 @@ void uiprivTestHookReportProgrammerError(uiprivTestHookReportProgrammerErrorFunc
void uiprivProgrammerError(const char *fmt, ...) void uiprivProgrammerError(const char *fmt, ...)
{ {
va_list ap; va_list ap;
char buf[programmerErrorBufSize];
int n; int n;
char buf[256];
va_start(ap, fmt); va_start(ap, fmt);
n = uiprivVsnprintf(buf, 256, fmt, ap); n = uiprivVsnprintf(buf, programmerErrorBufSize, fmt, ap);
if (n < 0) if (n < 0)
uiprivInternalError("programmer error has encoding error"); uiprivInternalError("programmer error has encoding error");
if (n >= 256) if (n >= programmerErrorBufSize)
uiprivInternalError("programmer error string too long (%d)", n); uiprivInternalError("programmer error string too long (%d)", n);
va_end(ap); va_end(ap);
if (reportProgrammerErrorTestHook != NULL) { if (reportProgrammerErrorTestHook != NULL) {