diff options
| author | bfredl <bjorn.linse@gmail.com> | 2024-02-10 12:07:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 12:07:37 +0100 |
| commit | 607606e3bb7a435ac5a0eba2eb4abde8eff774bb (patch) | |
| tree | d8c984815503a709cd5f122cf08aaa00d5b1a73d /src/nvim/api/private | |
| parent | 4948fa42efb90333a3b5738fd943b75f35415a7b (diff) | |
| parent | 2d0e29614b4417e9764b9f7d588a50fe7f752749 (diff) | |
| download | rneovim-607606e3bb7a435ac5a0eba2eb4abde8eff774bb.tar.gz rneovim-607606e3bb7a435ac5a0eba2eb4abde8eff774bb.tar.bz2 rneovim-607606e3bb7a435ac5a0eba2eb4abde8eff774bb.zip | |
Merge pull request #27398 from bfredl/arena2
refactor(api): use arena for more stuff
Diffstat (limited to 'src/nvim/api/private')
| -rw-r--r-- | src/nvim/api/private/helpers.c | 4 | ||||
| -rw-r--r-- | src/nvim/api/private/helpers.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c index cc95f46baf..8b45af7c71 100644 --- a/src/nvim/api/private/helpers.c +++ b/src/nvim/api/private/helpers.c @@ -425,12 +425,12 @@ String cstrn_as_string(char *str, size_t maxsize) /// @param str the C string to use /// @return The resulting String, or an empty String if /// str was NULL -String cstr_as_string(char *str) FUNC_ATTR_PURE +String cstr_as_string(const char *str) FUNC_ATTR_PURE { if (str == NULL) { return (String)STRING_INIT; } - return (String){ .data = str, .size = strlen(str) }; + return (String){ .data = (char *)str, .size = strlen(str) }; } /// Return the owned memory of a ga as a String diff --git a/src/nvim/api/private/helpers.h b/src/nvim/api/private/helpers.h index 0dbe3d2fb6..9ee812f45c 100644 --- a/src/nvim/api/private/helpers.h +++ b/src/nvim/api/private/helpers.h @@ -32,7 +32,8 @@ #define CSTR_AS_OBJ(s) STRING_OBJ(cstr_as_string(s)) #define CSTR_TO_OBJ(s) STRING_OBJ(cstr_to_string(s)) -#define CSTR_TO_ARENA_OBJ(arena, s) STRING_OBJ(arena_string(arena, cstr_as_string(s))) +#define CSTR_TO_ARENA_STR(arena, s) arena_string(arena, cstr_as_string(s)) +#define CSTR_TO_ARENA_OBJ(arena, s) STRING_OBJ(CSTR_TO_ARENA_STR(arena, s)) #define BUFFER_OBJ(s) ((Object) { \ .type = kObjectTypeBuffer, \ |