mirror of
https://github.com/neovim/neovim.git
synced 2025-09-28 05:58:33 +00:00
fixup: apply the change on more files
This commit is contained in:

committed by
Lewis Russell

parent
4b3845be2e
commit
200e7ad157
@@ -1375,7 +1375,7 @@ static inline void init_line_array(lua_State *lstate, Array *a, size_t size, Are
|
||||
/// @param s String to push
|
||||
/// @param len Size of string
|
||||
/// @param idx 0-based index to place s (only used for Lua)
|
||||
/// @param replace_nl Replace newlines ('\n') with null ('\0')
|
||||
/// @param replace_nl Replace newlines ('\n') with null (NUL)
|
||||
static void push_linestr(lua_State *lstate, Array *a, const char *s, size_t len, int idx,
|
||||
bool replace_nl, Arena *arena)
|
||||
{
|
||||
@@ -1384,7 +1384,7 @@ static void push_linestr(lua_State *lstate, Array *a, const char *s, size_t len,
|
||||
if (s && replace_nl && strchr(s, '\n')) {
|
||||
// TODO(bfredl): could manage scratch space in the arena, for the NUL case
|
||||
char *tmp = xmemdupz(s, len);
|
||||
strchrsub(tmp, '\n', '\0');
|
||||
strchrsub(tmp, '\n', NUL);
|
||||
lua_pushlstring(lstate, tmp, len);
|
||||
xfree(tmp);
|
||||
} else {
|
||||
@@ -1397,7 +1397,7 @@ static void push_linestr(lua_State *lstate, Array *a, const char *s, size_t len,
|
||||
str = CBUF_TO_ARENA_STR(arena, s, len);
|
||||
if (replace_nl) {
|
||||
// Vim represents NULs as NLs, but this may confuse clients.
|
||||
strchrsub(str.data, '\n', '\0');
|
||||
strchrsub(str.data, '\n', NUL);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -193,7 +193,7 @@ Dict(cmd) nvim_parse_cmd(String str, Dict(empty) *opts, Arena *arena, Error *err
|
||||
} else {
|
||||
nargs[0] = '0';
|
||||
}
|
||||
nargs[1] = '\0';
|
||||
nargs[1] = NUL;
|
||||
PUT_KEY(result, cmd, nargs, CSTR_TO_ARENA_OBJ(arena, nargs));
|
||||
|
||||
char *addr;
|
||||
@@ -391,7 +391,7 @@ String nvim_cmd(uint64_t channel_id, Dict(cmd) *cmd, Dict(cmd_opts) *opts, Arena
|
||||
case kObjectTypeBoolean:
|
||||
data_str = arena_alloc(arena, 2, false);
|
||||
data_str[0] = elem.data.boolean ? '1' : '0';
|
||||
data_str[1] = '\0';
|
||||
data_str[1] = NUL;
|
||||
ADD_C(args, CSTR_AS_OBJ(data_str));
|
||||
break;
|
||||
case kObjectTypeBuffer:
|
||||
|
@@ -17,7 +17,7 @@ void api_err_invalid(Error *err, const char *name, const char *val_s, int64_t va
|
||||
char *has_space = strchr(name, ' ');
|
||||
|
||||
// No value.
|
||||
if (val_s && val_s[0] == '\0') {
|
||||
if (val_s && val_s[0] == NUL) {
|
||||
api_set_error(err, errtype, has_space ? "Invalid %s" : "Invalid '%s'", name);
|
||||
return;
|
||||
}
|
||||
|
@@ -109,7 +109,7 @@ String exec_impl(uint64_t channel_id, String src, Dict(exec_opts) *opts, Error *
|
||||
// redir usually (except :echon) prepends a newline.
|
||||
if (s.data[0] == '\n') {
|
||||
memmove(s.data, s.data + 1, s.size - 1);
|
||||
s.data[s.size - 1] = '\0';
|
||||
s.data[s.size - 1] = NUL;
|
||||
s.size = s.size - 1;
|
||||
}
|
||||
return s; // Caller will free the memory.
|
||||
|
Reference in New Issue
Block a user