From af0f80953c60fb8dfb06965426ebe931678820bb Mon Sep 17 00:00:00 2001 From: Dr-Noob Date: Fri, 30 Mar 2018 16:15:22 +0200 Subject: [PATCH] Text color --- main.c | 30 ++++++++++++++++-------------- printer.c | 4 ++++ printer.h | 1 + 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/main.c b/main.c index c1f2238..c77f772 100644 --- a/main.c +++ b/main.c @@ -47,7 +47,7 @@ int main() { print_ascii(ascii,__COUNTER__); printf("\n"); - + print_ascii(ascii,__COUNTER__); printf("\n"); @@ -55,43 +55,43 @@ int main() { printf("\n"); print_ascii(ascii,__COUNTER__); - printf(TITLE_NAME"%s\n",cpuName); + print_text(ascii,TITLE_NAME,cpuName); print_ascii(ascii,__COUNTER__); - printf(TITLE_ARCH"%s\n","x86_64"); + print_text(ascii,TITLE_ARCH,"x86_64"); print_ascii(ascii,__COUNTER__); - printf(TITLE_FREQUENCY"%s\n",maxFrequency); + print_text(ascii,TITLE_FREQUENCY,maxFrequency); print_ascii(ascii,__COUNTER__); - printf(TITLE_NCORES"%s\n",nCores); + print_text(ascii,TITLE_NCORES,nCores); print_ascii(ascii,__COUNTER__); - printf(TITLE_AVX"%s\n",avx); + print_text(ascii,TITLE_AVX,avx); print_ascii(ascii,__COUNTER__); - printf(TITLE_SSE"%s\n",sse); + print_text(ascii,TITLE_SSE,sse); print_ascii(ascii,__COUNTER__); - printf(TITLE_FMA"%s\n",fma); + print_text(ascii,TITLE_FMA,fma); print_ascii(ascii,__COUNTER__); - printf(TITLE_AES"%s\n",aes); + print_text(ascii,TITLE_AES,aes); print_ascii(ascii,__COUNTER__); - printf(TITLE_SHA"%s\n",sha); + print_text(ascii,TITLE_SHA,sha); print_ascii(ascii,__COUNTER__); - printf(TITLE_L1"%s\n",l1); + print_text(ascii,TITLE_L1,l1); print_ascii(ascii,__COUNTER__); - printf(TITLE_L2"%s\n",l2); + print_text(ascii,TITLE_L2,l2); print_ascii(ascii,__COUNTER__); - printf(TITLE_L3"%s\n",l3); + print_text(ascii,TITLE_L3,l3); print_ascii(ascii,__COUNTER__); - printf(TITLE_PEAK"%s\n",getPeakPerformance(cpu,getFrequency(freq))); + print_text(ascii,TITLE_PEAK,getPeakPerformance(cpu,getFrequency(freq))); print_ascii(ascii,__COUNTER__); printf("\n"); @@ -118,7 +118,9 @@ int main() { free(l3); free(cpu); + free(ascii); freeCache(cach); freeFrequency(freq); + return EXIT_SUCCESS; } diff --git a/printer.c b/printer.c index 332a6f2..7dbd727 100644 --- a/printer.c +++ b/printer.c @@ -74,6 +74,10 @@ struct ascii* set_ascii(VENDOR cpuVendor) { return art; } +void print_text(struct ascii* art,char* title, char* text) { + printf("%s%s%s%s"RESET"\n",art->color1,title,art->color2,text); +} + void print_ascii(struct ascii* art, int n) { int flag = BOOLEAN_FALSE; diff --git a/printer.h b/printer.h index bbe4708..e7966e9 100644 --- a/printer.h +++ b/printer.h @@ -8,6 +8,7 @@ struct ascii; struct ascii* set_ascii(VENDOR cpuVendor); void print_ascii(struct ascii* art, int n); +void print_text(struct ascii* art,char* title, char* text); #define BOOLEAN_TRUE 1 #define BOOLEAN_FALSE 0