mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-18 08:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1342 from N-R-K/use_elements

Browse source 
consistently use ELEMENTS macro
This commit is contained in:
Arun 2022-04-14 06:26:16 +05:30 committed by GitHub
parent 59cf883437 d0bf2abb37
commit a555a7d122
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nnn.c
View file

@ -2160,7 +2160,7 @@ static bool initcurses(void *oldmask)
} }
/* Get and set the context colors */ /* Get and set the context colors */
for (uchar_t i = 0; i < CTX_MAX; ++i) { for (uchar_t i = 0; i < CTX_MAX; ++i) {
pcode = &g_ctx[i].color; pcode = &g_ctx[i].color;
if (colors && *colors) { if (colors && *colors) {
@ -2190,7 +2190,7 @@ static bool initcurses(void *oldmask)
memset(icon_positions, 0x7f, sizeof(icon_positions)); memset(icon_positions, 0x7f, sizeof(icon_positions));
for (uint_t i = 0; i < sizeof(icons_ext)/sizeof(struct icon_pair); ++i) { for (uint_t i = 0; i < ELEMENTS(icons_ext); ++i) {
c = TOUPPER(icons_ext[i].match[0]); c = TOUPPER(icons_ext[i].match[0]);
if (c >= 'A' && c <= 'Z') { if (c >= 'A' && c <= 'Z') {
if (icon_positions[c - 'A' + 10] == 0x7f7f) if (icon_positions[c - 'A' + 10] == 0x7f7f)
@ -4010,7 +4010,7 @@ static const struct icon_pair *get_icon(const struct entry *ent)
{ {
ushort_t i = 0; ushort_t i = 0;
for (; i < sizeof(icons_name)/sizeof(struct icon_pair); ++i) for (; i < ELEMENTS(icons_name); ++i)
if (strcasecmp(ent->name, icons_name[i].match) == 0) if (strcasecmp(ent->name, icons_name[i].match) == 0)
return &icons_name[i]; return &icons_name[i];
@ -4036,7 +4036,7 @@ static const struct icon_pair *get_icon(const struct entry *ent)
else else
i = 36; /* OTHER */ i = 36; /* OTHER */
for (ushort_t j = icon_positions[i]; j < sizeof(icons_ext)/sizeof(struct icon_pair) && for (ushort_t j = icon_positions[i]; j < ELEMENTS(icons_ext) &&
icons_ext[j].match[0] == icons_ext[icon_positions[i]].match[0]; ++j) icons_ext[j].match[0] == icons_ext[icon_positions[i]].match[0]; ++j)
if (strcasecmp(tmp, icons_ext[j].match) == 0) if (strcasecmp(tmp, icons_ext[j].match) == 0)
return &icons_ext[j]; return &icons_ext[j];
@ -6912,7 +6912,7 @@ nochange:
if (!S_ISREG(sb.st_mode)) { if (!S_ISREG(sb.st_mode)) {
printwait(messages[MSG_UNSUPPORTED], &presel); printwait(messages[MSG_UNSUPPORTED], &presel);
goto nochange; goto nochange;
} }
/* Handle plugin selection mode */ /* Handle plugin selection mode */
if (g_state.runplugin) { if (g_state.runplugin) {
@ -8108,7 +8108,7 @@ static void check_key_collision(void)
int key; int key;
bool bitmap[KEY_MAX] = {FALSE}; bool bitmap[KEY_MAX] = {FALSE};
for (ullong_t i = 0; i < sizeof(bindings) / sizeof(struct key); ++i) { for (ullong_t i = 0; i < ELEMENTS(bindings); ++i) {
key = bindings[i].sym; key = bindings[i].sym;
if (bitmap[key]) if (bitmap[key])