mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 20:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use macro in all places

Browse source
This commit is contained in:
Arun Prakash Jana 2021-06-19 20:36:16 +05:30
parent 3e91c2c977
commit b626cfa00f
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nnn.c
View file

@ -650,13 +650,14 @@ static const char * const messages[] = {
#define NNN_PLUG 2 #define NNN_PLUG 2
#define NNN_OPENER 3 #define NNN_OPENER 3
#define NNN_COLORS 4 #define NNN_COLORS 4
#define NNNLVL 5 #define NNN_FCOLORS 5
#define NNN_PIPE 6 #define NNNLVL 6
#define NNN_MCLICK 7 #define NNN_PIPE 7
#define NNN_SEL 8 #define NNN_MCLICK 8
#define NNN_ARCHIVE 9 #define NNN_SEL 9
#define NNN_HELP 10 /* strings end here */ #define NNN_ARCHIVE 10
#define NNN_TRASH 11 /* flags begin here */ #define NNN_HELP 11 /* strings end here */
#define NNN_TRASH 12 /* flags begin here */
static const char * const env_cfg[] = { static const char * const env_cfg[] = {
"NNN_OPTS", "NNN_OPTS",
@ -664,6 +665,7 @@ static const char * const env_cfg[] = {
"NNN_PLUG", "NNN_PLUG",
"NNN_OPENER", "NNN_OPENER",
"NNN_COLORS", "NNN_COLORS",
"NNN_FCOLORS",
"NNNLVL", "NNNLVL",
"NNN_PIPE", "NNN_PIPE",
"NNN_MCLICK", "NNN_MCLICK",
@ -1789,7 +1791,7 @@ static void export_file_list(void)
static bool init_fcolors(void) static bool init_fcolors(void)
{ {
char *f_colors = getenv("NNN_FCOLORS"); char *f_colors = getenv(env_cfg[NNN_FCOLORS]);
if (!f_colors || !*f_colors) if (!f_colors || !*f_colors)
f_colors = gcolors; f_colors = gcolors;
@ -1856,7 +1858,7 @@ static bool initcurses(void *oldmask)
if (COLORS >= 256) { if (COLORS >= 256) {
if (!(g_state.oldcolor || init_fcolors())) { if (!(g_state.oldcolor || init_fcolors())) {
exitcurses(); exitcurses();
msg("NNN_FCOLORS!"); msg(env_cfg[NNN_FCOLORS]);
return FALSE; return FALSE;
} }
} else } else
@ -1897,7 +1899,7 @@ static bool initcurses(void *oldmask)
fcolors[i + 1] = *pcode += xchartohex(*colors); fcolors[i + 1] = *pcode += xchartohex(*colors);
else { /* Each color code must be 2 hex symbols */ else { /* Each color code must be 2 hex symbols */
exitcurses(); exitcurses();
msg("NNN_COLORS!"); msg(env_cfg[NNN_COLORS]);
return FALSE; return FALSE;
} }
} else } else