aboutsummaryrefslogtreecommitdiff
path: root/utils.c
diff options
context:
space:
mode:
authorBruce Hill <bruce@bruce-hill.com>2021-01-19 21:35:34 -0800
committerBruce Hill <bruce@bruce-hill.com>2021-01-19 21:35:34 -0800
commit16c401fbbb4f22a29afe3d63c8105cc8f33061d0 (patch)
treef20c656ebf5a76eb2fe05fd6611be85ecc9232a2 /utils.c
parentb8bb6c25ecafc3398bbaa949398b80c4e1bce373 (diff)
Simplified code by disallowing escapes in strings and splitting
stringpatterns into chunks (so unescaped versions don't need to be created)
Diffstat (limited to 'utils.c')
-rw-r--r--utils.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/utils.c b/utils.c
index 08a5b6f..63a06fe 100644
--- a/utils.c
+++ b/utils.c
@@ -114,31 +114,11 @@ char unescapechar(const char *escaped, const char **end)
}
default: break;
}
- *end = &escaped[len];
+ if (end) *end = &escaped[len];
return (char)ret;
}
//
-// Write an unescaped version of `src` to `dest` (at most bufsize-1 chars,
-// terminated by a null byte)
-//
-size_t unescape_string(char *dest, const char *src, size_t bufsize)
-{
- size_t len = 0;
- while (*src && len < bufsize) {
- if (*src == '\\') {
- ++src;
- *(dest++) = unescapechar(src, &src);
- } else {
- *(dest++) = *(src++);
- }
- ++len;
- }
- *dest = '\0';
- return len;
-}
-
-//
// Fail and exit if a memory value is NULL
//
void *memcheck(void *p)