mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 20:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: reduce number of explicit char casts (#16077)

Browse Source 
* refactor: reduce number of explicit char casts
This commit is contained in:
dundargoc
2021-11-16 20:27:59 +01:00
committed by GitHub
parent 99211b008c
commit eba317d7a9
27 changed files with 151 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/eval/encode.c
View File

@@ -29,8 +29,6 @@
#include "nvim/message.h"
#include "nvim/vim.h" // For _()
#define utf_ptr2char(b) utf_ptr2char((char_u *)b)
#define utf_ptr2len(b) ((size_t)utf_ptr2len((char_u *)b))
#define utf_char2len(b) ((size_t)utf_char2len(b))
const char *const encode_bool_var_names[] = {
@@ -614,8 +612,8 @@ static inline int convert_to_json_string(garray_T *const gap, const char *const
#define ENCODE_RAW(ch) \
(ch >= 0x20 && utf_printable(ch))
for (size_t i = 0; i < utf_len;) {
const int ch = utf_ptr2char(utf_buf + i);
const size_t shift = (ch == 0? 1: utf_ptr2len(utf_buf + i));
const int ch = utf_ptr2char((char_u *)utf_buf + i);
const size_t shift = (ch == 0 ? 1 : ((size_t)utf_ptr2len((char_u *)utf_buf + i)));
assert(shift > 0);
i += shift;
switch (ch) {
@@ -654,11 +652,11 @@ static inline int convert_to_json_string(garray_T *const gap, const char *const
ga_append(gap, '"');
ga_grow(gap, (int)str_len);
for (size_t i = 0; i < utf_len;) {
const int ch = utf_ptr2char(utf_buf + i);
const int ch = utf_ptr2char((char_u *)utf_buf + i);
const size_t shift = (ch == 0? 1: utf_char2len(ch));
assert(shift > 0);
// Is false on invalid unicode, but this should already be handled.
assert(ch == 0 || shift == utf_ptr2len(utf_buf + i));
assert(ch == 0 || shift == ((size_t)utf_ptr2len((char_u *)utf_buf + i)));
switch (ch) {
case BS:
case TAB: