diff options
| -rw-r--r-- | src/nvim/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/nvim/hardcopy.c | 24 | ||||
| -rw-r--r-- | src/nvim/main.c | 2 | ||||
| -rw-r--r-- | src/nvim/normal.c | 2 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 | ||||
| -rw-r--r-- | src/nvim/tempfile.c | 2 |
6 files changed, 16 insertions, 18 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 1e63210394..10a9c87bba 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -7482,7 +7482,7 @@ int find_cmdline_var(const char_u *src, int *usedlen) FUNC_ATTR_NONNULL_ALL # define SPEC_AMATCH 9 }; - for (i = 0; i < (int)(sizeof(spec_str) / sizeof(char *)); ++i) { + for (i = 0; i < (int)ARRAY_SIZE(spec_str); ++i) { len = (int)STRLEN(spec_str[i]); if (STRNCMP(src, spec_str[i], len) == 0) { *usedlen = len; diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index 5d9d353fc8..f1f619066a 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -945,8 +945,6 @@ static colnr_T hardcopy_line(prt_settings_T *psettings, int page_line, prt_pos_T * http://www.adobe.com */ -#define NUM_ELEMENTS(arr) (sizeof(arr)/sizeof((arr)[0])) - #define PRT_PS_DEFAULT_DPI (72) /* Default user space resolution */ #define PRT_PS_DEFAULT_FONTSIZE (10) #define PRT_PS_DEFAULT_BUFFER_SIZE (80) @@ -1139,33 +1137,33 @@ static struct prt_ps_charset_S k_charsets[] = static struct prt_ps_mbfont_S prt_ps_mbfonts[] = { { - NUM_ELEMENTS(j_encodings), + ARRAY_SIZE(j_encodings), j_encodings, - NUM_ELEMENTS(j_charsets), + ARRAY_SIZE(j_charsets), j_charsets, "jis_roman", "JIS_X_1983" }, { - NUM_ELEMENTS(sc_encodings), + ARRAY_SIZE(sc_encodings), sc_encodings, - NUM_ELEMENTS(sc_charsets), + ARRAY_SIZE(sc_charsets), sc_charsets, "gb_roman", "GB_2312-80" }, { - NUM_ELEMENTS(tc_encodings), + ARRAY_SIZE(tc_encodings), tc_encodings, - NUM_ELEMENTS(tc_charsets), + ARRAY_SIZE(tc_charsets), tc_charsets, "cns_roman", "BIG5" }, { - NUM_ELEMENTS(k_encodings), + ARRAY_SIZE(k_encodings), k_encodings, - NUM_ELEMENTS(k_charsets), + ARRAY_SIZE(k_charsets), k_charsets, "ks_roman", "KS_X_1992" @@ -1639,12 +1637,12 @@ static int prt_next_dsc(struct prt_dsc_line_S *p_dsc_line) return FALSE; /* Find type of DSC comment */ - for (comment = 0; comment < (int)NUM_ELEMENTS(prt_dsc_table); comment++) + for (comment = 0; comment < (int)ARRAY_SIZE(prt_dsc_table); comment++) if (prt_resfile_strncmp(0, prt_dsc_table[comment].string, prt_dsc_table[comment].len) == 0) break; - if (comment != NUM_ELEMENTS(prt_dsc_table)) { + if (comment != ARRAY_SIZE(prt_dsc_table)) { /* Return type of comment */ p_dsc_line->type = prt_dsc_table[comment].type; offset = prt_dsc_table[comment].len; @@ -2135,7 +2133,7 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit) props = enc_canon_props(p_encoding); if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE))) { p_mbenc_first = NULL; - for (cmap = 0; cmap < (int)NUM_ELEMENTS(prt_ps_mbfonts); cmap++) + for (cmap = 0; cmap < (int)ARRAY_SIZE(prt_ps_mbfonts); cmap++) if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap], &p_mbenc)) { if (p_mbenc_first == NULL) diff --git a/src/nvim/main.c b/src/nvim/main.c index 6c2cb2b645..23c48651b1 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -2168,7 +2168,7 @@ static void usage(void) for (i = 0;; ++i) { mch_msg(_(" vim [arguments] ")); mch_msg(_(use[i])); - if (i == (sizeof(use) / sizeof(char_u *)) - 1) + if (i == ARRAY_SIZE(use) - 1) break; mch_msg(_("\n or:")); } diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 7a2cd686c6..e1dc2b93d9 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -318,7 +318,7 @@ static const struct nv_cmd { }; /* Number of commands in nv_cmds[]. */ -#define NV_CMDS_SIZE (sizeof(nv_cmds) / sizeof(struct nv_cmd)) +#define NV_CMDS_SIZE ARRAY_SIZE(nv_cmds) /* Sorted index of commands in nv_cmds[]. */ static short nv_cmd_idx[NV_CMDS_SIZE]; diff --git a/src/nvim/option.c b/src/nvim/option.c index fe2c756c01..5b5570fad4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1808,7 +1808,7 @@ static struct vimoption } }; -#define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption)) +#define PARAM_COUNT ARRAY_SIZE(options) static char *(p_ambw_values[]) = {"single", "double", NULL}; static char *(p_bg_values[]) = {"light", "dark", NULL}; diff --git a/src/nvim/tempfile.c b/src/nvim/tempfile.c index 33d6f0f37d..f81aff53a1 100644 --- a/src/nvim/tempfile.c +++ b/src/nvim/tempfile.c @@ -30,7 +30,7 @@ static void vim_maketempdir(void) // Try the entries in `TEMP_DIR_NAMES` to create the temp directory. char_u template[TEMP_FILE_PATH_MAXLEN]; char_u path[TEMP_FILE_PATH_MAXLEN]; - for (size_t i = 0; i < sizeof(temp_dirs) / sizeof(char *); ++i) { + for (size_t i = 0; i < ARRAY_SIZE(temp_dirs); ++i) { // Expand environment variables, leave room for "/nvimXXXXXX/999999999" expand_env((char_u *)temp_dirs[i], template, TEMP_FILE_PATH_MAXLEN - 22); if (!os_isdir(template)) { // directory doesn't exist |