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

Reduce late assignments

Browse source
This commit is contained in:
Arun Prakash Jana 2021-05-09 09:02:29 +05:30
parent e075b98cfe
commit b5654e3188
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nnn.c
View file

@ -3670,17 +3670,25 @@ static char get_detail_ind(const mode_t mode)
return '?'; return '?';
} }
/* Note: attribute and indicator values must be initialized to 0 */
static uchar_t get_color_pair_name_ind(const struct entry *ent, char *pind, int *pattr) static uchar_t get_color_pair_name_ind(const struct entry *ent, char *pind, int *pattr)
{ {
switch (ent->mode & S_IFMT) { switch (ent->mode & S_IFMT) {
case S_IFREG: case S_IFREG:
*pind = (ent->mode & 0100) ? '*' : '\0'; if (!ent->size) {
if (!ent->size)
return C_UND;
if (ent->flags & HARD_LINK)
return C_HRD;
if (ent->mode & 0100) if (ent->mode & 0100)
*pind = '*';
return C_UND;
}
if (ent->flags & HARD_LINK) {
if (ent->mode & 0100)
*pind = '*';
return C_HRD;
}
if (ent->mode & 0100) {
*pind = '*';
return C_EXE; return C_EXE;
}
return C_FIL; return C_FIL;
case S_IFDIR: case S_IFDIR:
*pind = '/'; *pind = '/';
@ -3707,10 +3715,8 @@ static uchar_t get_color_pair_name_ind(const struct entry *ent, char *pind, int
*pind = '|'; *pind = '|';
return C_PIP; return C_PIP;
case S_IFBLK: case S_IFBLK:
*pind = '\0';
return C_BLK; return C_BLK;
case S_IFCHR: case S_IFCHR:
*pind = '\0';
return C_CHR; return C_CHR;
} }
@ -3720,7 +3726,7 @@ static uchar_t get_color_pair_name_ind(const struct entry *ent, char *pind, int
static void printent(const struct entry *ent, uint_t namecols, bool sel) static void printent(const struct entry *ent, uint_t namecols, bool sel)
{ {
char ind; char ind = '\0';
int attrs = 0; int attrs = 0;
uchar_t color_pair = get_color_pair_name_ind(ent, &ind, &attrs); uchar_t color_pair = get_color_pair_name_ind(ent, &ind, &attrs);