From d86810a42587527191e0de15c252a92932a4ef4a Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Sun, 16 Aug 2020 06:54:47 +0530 Subject: [PATCH] Minor reformat --- Makefile | 2 +- misc/haiku/Makefile | 2 +- src/icons.h | 8 ++++---- src/nnn.c | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 1a80dfb6..11384889 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ O_NOMOUSE := 0 # no mouse support O_NOBATCH := 0 # no built-in batch renamer O_NOFIFO := 0 # no FIFO previewer support O_CTX8 := 0 # enable 8 contexts -O_ICONS := 0 # support icons +O_ICONS := 0 # support icons # convert targets to flags for backwards compatibility ifneq ($(filter debug,$(MAKECMDGOALS)),) diff --git a/misc/haiku/Makefile b/misc/haiku/Makefile index ba10734c..34057df7 100644 --- a/misc/haiku/Makefile +++ b/misc/haiku/Makefile @@ -17,7 +17,7 @@ O_NOMOUSE := 0 # no mouse support O_NOBATCH := 0 # no built-in batch renamer O_NOFIFO := 0 # no FIFO previewer support O_CTX8 := 0 # enable 8 contexts -O_ICONS := 0 # support icons +O_ICONS := 0 # support icons # convert targets to flags for backwards compatibility ifneq ($(filter debug,$(MAKECMDGOALS)),) diff --git a/src/icons.h b/src/icons.h index 149d889a..69872be4 100644 --- a/src/icons.h +++ b/src/icons.h @@ -3,10 +3,10 @@ struct icon_pair { const char *match; const char *icon; - const unsigned char color; + const unsigned char color; /* Hex xterm 256 color code, 0 to follow file specific */ }; -/* +/* * Define a string to be printed before and after the icon * Adjust if the icons are not printed properly */ @@ -38,7 +38,7 @@ static const struct icon_pair icons_name[] = { {"Videos", FA_FILM, 0}, }; -/* +/* * New entries should bu added such that the first character of the extension is in the correct group . * This is done for performance reason so that the correct icon can be found faster. * All entries are case-insensitive @@ -93,7 +93,7 @@ static const struct icon_pair icons_ext[] = { {"elf", FA_LINUX, 0}, {"epub", FA_FILE_PDF_O, 0}, {"exe", FA_WINDOWS, 0}, - + /* F */ {"f#", DEV_FSHARP, 0}, {"flac", FA_FILE_AUDIO_O, 0}, diff --git a/src/nnn.c b/src/nnn.c index 0a13eb21..a001d136 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -3482,10 +3482,9 @@ static const char *get_icon(const struct entry *ent){ i = 27; /* OTHER */ for (j = icon_positions[i]; j < sizeof(icons_ext)/sizeof(struct icon_pair) && - 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) return icons_ext[j].icon; - } return file_icon.icon; } @@ -3582,7 +3581,7 @@ static void printent(const struct entry *ent, uint namecols, bool sel) addstr(ICON_PADDING_LEFT); addstr(get_icon(ent)); addstr(ICON_PADDING_RIGHT); - } + } #endif #ifndef NOLOCALE