Cleanup up cflogprinter

4 files changed, 7 insertions, 21 deletions

diff --git a/inc/cflogprinter.h b/inc/cflogprinter.h
index 4d561b3..2c7f2b1 100644
--- a/inc/cflogprinter.h
+++ b/inc/cflogprinter.h
@@ -12,8 +12,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-void cflp_good(char *msg, ...);
-void cflp_bad(char *msg, ...);
+void cflp_success(char *msg, ...);
 void cflp_error(char *msg, ...);
 void cflp_warning(char *msg, ...);
 void cflp_info(char *msg, ...);
diff --git a/src/cflogprinter.c b/src/cflogprinter.c
index db57214..f995609 100644
--- a/src/cflogprinter.c
+++ b/src/cflogprinter.c
@@ -1,6 +1,6 @@
 #include <cflogprinter.h>
 
-void cflp_good(char *msg, ...) {
+void cflp_success(char *msg, ...) {
     printf("%s[+] ", GREEN);
 
     va_list arg;
@@ -13,19 +13,6 @@ void cflp_good(char *msg, ...) {
 
 }
 
-void cflp_bad(char *msg, ...) {
-    printf("%s[-] ", RED);
-
-    va_list arg;
-
-    va_start (arg, msg);
-    vfprintf (stdout, msg, arg);
-    va_end (arg);
-
-    printf("%s\n", RESET);
-
-}
-
 void cflp_error(char *msg, ...) {
     printf("%s[-] ", RED);
 
@@ -40,7 +27,7 @@ void cflp_error(char *msg, ...) {
 }
 
 void cflp_warning(char *msg, ...) {
-    printf("%s[!] ", RED);
+    printf("%s[!] ", YELLOW);
 
     va_list arg;
 
diff --git a/src/main.c b/src/main.c
index 7c206fe..e831fef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -123,7 +123,7 @@ int main(int argc, char** argv) {
         }
 
         if(0 == system("pidof swaybg > /dev/null")) {
-            cflp_warning("Warning: swaybg is running. This may block mpvpaper from being seen.");
+            cflp_warning("swaybg is running. This may block mpvpaper from being seen.");
         }
 
         paper_init(argv[optind], argv[optind + 1], verbose, layer);
diff --git a/src/paper.c b/src/paper.c
index 9360bfc..0f8dadb 100644
--- a/src/paper.c
+++ b/src/paper.c
@@ -131,7 +131,7 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
         return 1;
     }
     else if (verbose) {
-        cflp_good("Connected to output %s", monitor);
+        cflp_success("Connected to output %s", monitor);
     }
 
 
@@ -216,7 +216,7 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
         }
     }
     if (!egl_ctx) {
-        cflp_bad("Failed to create EGL context");
+        cflp_error("Failed to create EGL context");
         return 1;
     }
 
@@ -230,7 +230,7 @@ int paper_init(char* _monitor, char* video_path, int verbose, char* layer_name)
     // Start mpv
     mpv_handle* mpv = mpv_create();
     if (!mpv) {
-        cflp_bad("Failed creating mpv context");
+        cflp_error("Failed creating mpv context");
         return 1;
     }