diff options
| author | Vito Caputo <vcaputo@pengaru.com> | 2023-06-26 17:19:35 -0700 |
|---|---|---|
| committer | Vito Caputo <vcaputo@pengaru.com> | 2023-07-04 21:09:16 -0700 |
| commit | 3c5db5339454f48edb48c9b1498c1832c6711eb1 (patch) | |
| tree | 2c371c67ffe963ac85904090d45e6f163781b8ee /src/til_setup.c | |
| parent | a33c742c87c5e267f00e561c27f96ddfb522f6bc (diff) | |
til_str: exclude \0 from res_len for til_str_buf()/til_str_to_buf()
It's more ergonomic more often to behave consistently with
strlen() here, plus it's just the established mental model.
While here I made til_settings_path_as_buf() private as nothing
external uses it, it's essentially just a logically distinct
private helper function from the public wrappers around it.
Dragged into this changeset due to clarifying some
naming/semantics as it's one of the few til_str_to_buf() callers.
But nobody was actually passing a non-NULL res_bufsz/res_len to
it anyways, as its use is minimal.
Diffstat (limited to 'src/til_setup.c')
| -rw-r--r-- | src/til_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/til_setup.c b/src/til_setup.c index 23827f3..bd57073 100644 --- a/src/til_setup.c +++ b/src/til_setup.c @@ -25,7 +25,7 @@ void * til_setup_new(const til_settings_t *settings, size_t size, void (*free_func)(til_setup_t *setup)) { char *path_buf = NULL; - size_t path_sz; + size_t path_len; til_str_t *path_str; til_setup_t *setup; int r; @@ -41,7 +41,7 @@ void * til_setup_new(const til_settings_t *settings, size_t size, void (*free_fu if (r < 0) return til_str_free(path_str); - path_buf = til_str_to_buf(path_str, &path_sz); + path_buf = til_str_to_buf(path_str, &path_len); setup = calloc(1, size); if (!setup) { @@ -50,7 +50,7 @@ void * til_setup_new(const til_settings_t *settings, size_t size, void (*free_fu } setup->path = path_buf; - setup->path_hash = til_jenkins((uint8_t *)path_buf, path_sz); + setup->path_hash = til_jenkins((uint8_t *)path_buf, path_len + 1 /* include the \0 */); setup->refcount = 1; setup->free = free_func; |