r4/ds
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add number.h (and adapt existing code)

Browse Source
This commit is contained in:
r4 2022-05-29 20:43:30 +02:00
parent 0627084381
commit 8e9ff3b108
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ds/error.c
View File

@ -2,6 +2,7 @@
// SPDX license identifier: MIT
#include <ds/error.h>
#include <ds/number.h>
void *error_reserved_for_error = NULL;
@ -20,37 +21,25 @@ void error_term() {
size_t error_to_string(char *buf, size_t size, Error e, bool destroy) {
size_t written = 0;
if (e.has_location) {
size_t left = size > written ? size - written : 0;
written += snprintf(buf + written, left, "%s:%zu: ", e.file, e.line);
written += snprintf(buf + written, sub_clamped(size, written), "%s:%zu: ", e.file, e.line);
}
switch (e.kind) {
case ErrorNone: {
size_t left = size > written ? size - written : 0;
written += snprintf(buf + written, left, "Success");
}
case ErrorNone:
written += snprintf(buf + written, sub_clamped(size, written), "Success");
break;
case ErrorOutOfMemory: {
size_t left = size > written ? size - written : 0;
written += snprintf(buf + written, left, "Out of memory");
}
case ErrorOutOfMemory:
written += snprintf(buf + written, sub_clamped(size, written), "Out of memory");
break;
case ErrorString: {
size_t left = size > written ? size - written : 0;
written += snprintf(buf + written, left, "%s", e.str);
written += snprintf(buf + written, sub_clamped(size, written), "%s", e.str);
if (e.str_on_heap && destroy)
free(e.str);
}
break;
}
if (e.has_annex) {
{
size_t left = size > written ? size - written : 0;
written += snprintf(buf + written, left, ": ");
}
{
size_t left = size > written ? size - written : 0;
written += error_to_string(buf + written, left, *e.annex, destroy);
}
written += snprintf(buf + written, sub_clamped(size, written), ": ");
written += error_to_string(buf + written, sub_clamped(size, written), *e.annex, destroy);
if (destroy)
free(e.annex);
}

3
src/ds/fmt.c
View File

@ -4,6 +4,7 @@
#define GENERIC_IMPL_STATIC
#include <ds/fmt.h>
#include <ds/number.h>
#include <ds/types.h>
#include <stdio.h>
@ -531,7 +532,7 @@ size_t _fmtsv(const char *restrict file, size_t line, char *restrict buf, size_t
};
_fmtcv(file, line, &ctx, format, args);
if (size > 0)
buf[ctxs.written < size - 1 ? ctxs.written : size - 1] = 0;
buf[min(ctxs.written, size - 1)] = 0;
return ctxs.written;
}