From 2ab3f8eb4046c03bb3794f9601a8bc12367f68e5 Mon Sep 17 00:00:00 2001 From: Dr-Noob Date: Thu, 19 Aug 2021 13:39:57 +0200 Subject: [PATCH] [v0.99] Small refactoring (fix compilation issues) --- src/common/ascii.h | 6 +++--- src/common/printer.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/ascii.h b/src/common/ascii.h index 6d3f148..ecc85e0 100644 --- a/src/common/ascii.h +++ b/src/common/ascii.h @@ -1,7 +1,7 @@ #ifndef __ASCII__ #define __ASCII__ -#define C_NONE "" +#define COLOR_NONE "" #define C_FG_BLACK "\x1b[30;1m" #define C_FG_RED "\x1b[31;1m" #define C_FG_GREEN "\x1b[32;1m" @@ -26,7 +26,7 @@ #define C_FG_B_MAGENTA "\x1b[95;1m" #define C_FG_B_CYAN "\x1b[96;1m" #define C_FG_B_WHITE "\x1b[97;1m" -#define C_RESET "\x1b[m" +#define COLOR_RESET "\x1b[m" struct ascii_logo { char* art; @@ -324,6 +324,6 @@ asciiL logo_intel_l = { ASCII_INTEL_L, 62, 19, true, {C_BG_CYAN, C_BG_W asciiL logo_intel_l_new = { ASCII_INTEL_L_NEW, 57, 14, true, {C_BG_CYAN, C_BG_WHITE, C_BG_BLUE}, {C_FG_CYAN, C_FG_WHITE} }; asciiL logo_arm_l = { ASCII_ARM_L, 60, 8, true, {C_BG_CYAN}, {C_FG_WHITE, C_FG_CYAN} }; asciiL logo_ibm_l = { ASCII_IBM_L, 62, 13, true, {C_BG_CYAN, C_FG_WHITE}, {C_FG_CYAN, C_FG_WHITE} }; -asciiL logo_unknown = { NULL, 0, 0, false, {C_NONE}, {C_NONE, C_NONE} }; +asciiL logo_unknown = { NULL, 0, 0, false, {COLOR_NONE}, {COLOR_NONE, COLOR_NONE} }; #endif diff --git a/src/common/printer.c b/src/common/printer.c index 8fc7fed..0e51f64 100644 --- a/src/common/printer.c +++ b/src/common/printer.c @@ -246,14 +246,14 @@ void replace_bgbyfg_color(struct ascii_logo* logo) { for(int i=0; i < 3; i++) { if(logo->color_ascii[i] == NULL) break; - if(strcmp(logo->color_ascii[i], COLOR_BG_BLACK) == 0) strcpy(logo->color_ascii[i], COLOR_FG_BLACK); - else if(strcmp(logo->color_ascii[i], COLOR_BG_RED) == 0) strcpy(logo->color_ascii[i], COLOR_FG_RED); - else if(strcmp(logo->color_ascii[i], COLOR_BG_GREEN) == 0) strcpy(logo->color_ascii[i], COLOR_FG_GREEN); - else if(strcmp(logo->color_ascii[i], COLOR_BG_YELLOW) == 0) strcpy(logo->color_ascii[i], COLOR_FG_YELLOW); - else if(strcmp(logo->color_ascii[i], COLOR_BG_BLUE) == 0) strcpy(logo->color_ascii[i], COLOR_FG_BLUE); - else if(strcmp(logo->color_ascii[i], COLOR_BG_MAGENTA) == 0) strcpy(logo->color_ascii[i], COLOR_FG_MAGENTA); - else if(strcmp(logo->color_ascii[i], COLOR_BG_CYAN) == 0) strcpy(logo->color_ascii[i], COLOR_FG_CYAN); - else if(strcmp(logo->color_ascii[i], COLOR_BG_WHITE) == 0) strcpy(logo->color_ascii[i], COLOR_FG_WHITE); + if(strcmp(logo->color_ascii[i], C_BG_BLACK) == 0) strcpy(logo->color_ascii[i], C_FG_BLACK); + else if(strcmp(logo->color_ascii[i], C_BG_RED) == 0) strcpy(logo->color_ascii[i], C_FG_RED); + else if(strcmp(logo->color_ascii[i], C_BG_GREEN) == 0) strcpy(logo->color_ascii[i], C_FG_GREEN); + else if(strcmp(logo->color_ascii[i], C_BG_YELLOW) == 0) strcpy(logo->color_ascii[i], C_FG_YELLOW); + else if(strcmp(logo->color_ascii[i], C_BG_BLUE) == 0) strcpy(logo->color_ascii[i], C_FG_BLUE); + else if(strcmp(logo->color_ascii[i], C_BG_MAGENTA) == 0) strcpy(logo->color_ascii[i], C_FG_MAGENTA); + else if(strcmp(logo->color_ascii[i], C_BG_CYAN) == 0) strcpy(logo->color_ascii[i], C_FG_CYAN); + else if(strcmp(logo->color_ascii[i], C_BG_WHITE) == 0) strcpy(logo->color_ascii[i], C_FG_WHITE); } }