diff options
| author | K.Takata <kentkt@csc.jp> | 2021-06-02 13:28:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-02 13:28:16 +0200 |
| commit | eeec2548785b2dd245a31ab25d7bde0f88ea1a6d (patch) | |
| tree | 533236c436888fd7a072c4d94a75279158f9c8a5 /src/hardcopy.c | |
| parent | b54abeeafb074248597878a874fed9a66b114c06 (diff) | |
| download | vim-git-eeec2548785b2dd245a31ab25d7bde0f88ea1a6d.tar.gz | |
patch 8.2.2922: computing array length is done in various waysv8.2.2922
Problem: Computing array length is done in various ways.
Solution: Use ARRAY_LENGTH everywhere. (Ken Takata, closes #8305)
Diffstat (limited to 'src/hardcopy.c')
| -rw-r--r-- | src/hardcopy.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/hardcopy.c b/src/hardcopy.c index a6df81631..069fa43dd 100644 --- a/src/hardcopy.c +++ b/src/hardcopy.c @@ -972,8 +972,6 @@ hardcopy_line( * 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) @@ -985,7 +983,7 @@ struct prt_mediasize_S float height; }; -#define PRT_MEDIASIZE_LEN (sizeof(prt_mediasize) / sizeof(struct prt_mediasize_S)) +#define PRT_MEDIASIZE_LEN ARRAY_LENGTH(prt_mediasize) static struct prt_mediasize_S prt_mediasize[] = { @@ -1210,33 +1208,33 @@ struct prt_ps_mbfont_S static struct prt_ps_mbfont_S prt_ps_mbfonts[] = { { - NUM_ELEMENTS(j_encodings), + ARRAY_LENGTH(j_encodings), j_encodings, - NUM_ELEMENTS(j_charsets), + ARRAY_LENGTH(j_charsets), j_charsets, "jis_roman", "JIS_X_1983" }, { - NUM_ELEMENTS(sc_encodings), + ARRAY_LENGTH(sc_encodings), sc_encodings, - NUM_ELEMENTS(sc_charsets), + ARRAY_LENGTH(sc_charsets), sc_charsets, "gb_roman", "GB_2312-80" }, { - NUM_ELEMENTS(tc_encodings), + ARRAY_LENGTH(tc_encodings), tc_encodings, - NUM_ELEMENTS(tc_charsets), + ARRAY_LENGTH(tc_charsets), tc_charsets, "cns_roman", "BIG5" }, { - NUM_ELEMENTS(k_encodings), + ARRAY_LENGTH(k_encodings), k_encodings, - NUM_ELEMENTS(k_charsets), + ARRAY_LENGTH(k_charsets), k_charsets, "ks_roman", "KS_X_1992" @@ -1793,12 +1791,12 @@ 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_LENGTH(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_LENGTH(prt_dsc_table)) { // Return type of comment p_dsc_line->type = prt_dsc_table[comment].type; @@ -2385,7 +2383,7 @@ mch_print_init( int cmap_first = 0; p_mbenc_first = NULL; - for (cmap = 0; cmap < (int)NUM_ELEMENTS(prt_ps_mbfonts); cmap++) + for (cmap = 0; cmap < (int)ARRAY_LENGTH(prt_ps_mbfonts); cmap++) if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap], &p_mbenc)) { |