From a0af3b0eb6fd2c93f724831eee642f64eb0770d5 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Mon, 22 Mar 2021 20:02:32 +0100
Subject: [PATCH] ffStrbufPutTo

---
 src/common.c               | 6 ++----
 src/modules/battery.c      | 3 +--
 src/modules/de.c           | 6 +++---
 src/modules/disk.c         | 3 +--
 src/modules/font.c         | 5 ++---
 src/modules/icons.c        | 6 ++----
 src/modules/kernel.c       | 3 +--
 src/modules/memory.c       | 3 +--
 src/modules/packages.c     | 2 +-
 src/modules/terminal.c     | 6 ++----
 src/modules/terminalfont.c | 3 +--
 src/modules/theme.c        | 7 ++-----
 src/modules/uptime.c       | 2 +-
 src/modules/wm.c           | 6 ++----
 src/util/FFstrbuf.c        | 6 ++++++
 src/util/FFstrbuf.h        | 1 +
 16 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/src/common.c b/src/common.c
index 7944ae18a..8beb57417 100644
--- a/src/common.c
+++ b/src/common.c
@@ -300,8 +300,7 @@ bool ffPrintCachedValue(FFinstance* instance, const char* key)
     }
 
     ffPrintLogoAndKey(instance, key);
-    ffStrbufWriteTo(&value, stdout);
-    putchar('\n');
+    ffStrbufPutTo(&value, stdout);
     ffStrbufDestroy(&value);
     return true;
 }
@@ -309,8 +308,7 @@ bool ffPrintCachedValue(FFinstance* instance, const char* key)
 void ffPrintAndSaveCachedValue(FFinstance* instance, const char* key, FFstrbuf* value)
 {
     ffPrintLogoAndKey(instance, key);
-    ffStrbufWriteTo(value, stdout);
-    putchar('\n');
+    ffStrbufPutTo(value, stdout);
 
     if(!instance->config.cacheSave)
         return;
diff --git a/src/modules/battery.c b/src/modules/battery.c
index 6fd4982ab..2ad0f8dfd 100644
--- a/src/modules/battery.c
+++ b/src/modules/battery.c
@@ -86,8 +86,7 @@ static void printBattery(FFinstance* instance, uint8_t index)
             (FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &status}
         );
 
-        ffStrbufWriteTo(&battery, stdout);
-        putchar('\n');
+        ffStrbufPutTo(&battery, stdout);
         ffStrbufDestroy(&battery);
     }
 
diff --git a/src/modules/de.c b/src/modules/de.c
index 43d394291..a6e5053a0 100644
--- a/src/modules/de.c
+++ b/src/modules/de.c
@@ -64,6 +64,8 @@ void ffPrintDesktopEnvironment(FFinstance* instance)
 
         if(!ffStrbufIsEmpty(&sessionType))
             printf("(%s)", sessionType.chars);
+
+        putchar('\n');
     }
     else
     {
@@ -77,11 +79,9 @@ void ffPrintDesktopEnvironment(FFinstance* instance)
             (FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &sessionType}
         );
 
-        ffStrbufWriteTo(&de, stdout);
+        ffStrbufPutTo(&de, stdout);
         ffStrbufDestroy(&de);
     }
-    putchar('\n');
-
     ffStrbufDestroy(&sessionType);
     ffStrbufDestroy(&sessionVersion);
     ffStrbufDestroy(&sessionDesktop);
diff --git a/src/modules/disk.c b/src/modules/disk.c
index 37face795..e7ddd6cc6 100644
--- a/src/modules/disk.c
+++ b/src/modules/disk.c
@@ -35,8 +35,7 @@ void ffPrintDisk(FFinstance* instance)
             (FFformatarg){FF_FORMAT_ARG_TYPE_UINT8, &percentage}
         );
 
-        ffStrbufWriteTo(&disk, stdout);
-        putchar('\n');
+        ffStrbufPutTo(&disk, stdout);
         ffStrbufDestroy(&disk);
     }
 }
\ No newline at end of file
diff --git a/src/modules/font.c b/src/modules/font.c
index 2d2795fae..de9c05613 100644
--- a/src/modules/font.c
+++ b/src/modules/font.c
@@ -46,7 +46,7 @@ void ffPrintFont(FFinstance* instance)
     if(ffStrbufIsEmpty(&instance->config.fontFormat))
     {
         printf("%s [Plasma], ", plasmaPretty);
-        ffStrbufWriteTo(&gtkPretty, stdout);
+        ffStrbufPutTo(&gtkPretty, stdout);
     }
     else
     {
@@ -60,10 +60,9 @@ void ffPrintFont(FFinstance* instance)
             (FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &gtkPretty}
         );
 
-        ffStrbufWriteTo(&font, stdout);
+        ffStrbufPutTo(&font, stdout);
         ffStrbufDestroy(&font);
     }
 
-    putchar('\n');
     ffStrbufDestroy(&gtkPretty);
 }
\ No newline at end of file
diff --git a/src/modules/icons.c b/src/modules/icons.c
index bb48720f2..21b5b79eb 100644
--- a/src/modules/icons.c
+++ b/src/modules/icons.c
@@ -32,7 +32,7 @@ void ffPrintIcons(FFinstance* instance)
         else
             printf("%s [Plasma], ", plasma);
 
-        ffStrbufWriteTo(&gtkPretty, stdout);
+        ffStrbufPutTo(&gtkPretty, stdout);
     }
     else
     {
@@ -46,11 +46,9 @@ void ffPrintIcons(FFinstance* instance)
             (FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &gtkPretty}
         );
 
-        ffStrbufWriteTo(&icons, stdout);
+        ffStrbufPutTo(&icons, stdout);
         ffStrbufDestroy(&icons);
     }
 
-    putchar('\n');
-
     ffStrbufDestroy(&gtkPretty);
 }
\ No newline at end of file
diff --git a/src/modules/kernel.c b/src/modules/kernel.c
index ecbaa80a9..90cdb68d0 100644
--- a/src/modules/kernel.c
+++ b/src/modules/kernel.c
@@ -18,7 +18,6 @@ void ffPrintKernel(FFinstance* instance)
     );
 
     ffPrintLogoAndKey(instance, "Kernel");
-    ffStrbufWriteTo(&kernel, stdout);
-    putchar('\n');
+    ffStrbufPutTo(&kernel, stdout);
     ffStrbufDestroy(&kernel);
 }
\ No newline at end of file
diff --git a/src/modules/memory.c b/src/modules/memory.c
index 0ea5bd90d..098350a1d 100644
--- a/src/modules/memory.c
+++ b/src/modules/memory.c
@@ -46,8 +46,7 @@ void ffPrintMemory(FFinstance* instance)
             (FFformatarg){FF_FORMAT_ARG_TYPE_UINT8, &percentage}
         );
 
-        ffStrbufWriteTo(&memory, stdout);
-        putchar('\n');
+        ffStrbufPutTo(&memory, stdout);
         ffStrbufDestroy(&memory);
     }
 }
\ No newline at end of file
diff --git a/src/modules/packages.c b/src/modules/packages.c
index d82343d8f..e512229ff 100644
--- a/src/modules/packages.c
+++ b/src/modules/packages.c
@@ -66,6 +66,6 @@ void ffPrintPackages(FFinstance* instance)
     );
 
     ffPrintLogoAndKey(instance, "Packages");
-    ffStrbufWriteTo(&packages, stdout);
+    ffStrbufPutTo(&packages, stdout);
     ffStrbufDestroy(&packages);
 }
\ No newline at end of file
diff --git a/src/modules/terminal.c b/src/modules/terminal.c
index c91bcafd2..c66b8ff08 100644
--- a/src/modules/terminal.c
+++ b/src/modules/terminal.c
@@ -90,7 +90,7 @@ void ffPrintTerminal(FFinstance* instance)
     
     if(ffStrbufIsEmpty(&instance->config.terminalFormat))
     {
-        ffStrbufWriteTo(&instance->state.terminal.value, stdout);
+        ffStrbufPutTo(&instance->state.terminal.value, stdout);
     }
     else
     {
@@ -100,8 +100,6 @@ void ffPrintTerminal(FFinstance* instance)
             (FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.terminal.value}
         );
 
-        ffStrbufWriteTo(&terminal, stdout);
+        ffStrbufPutTo(&terminal, stdout);
     }
-
-    putchar('\n');
 }
diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c
index 8c87957d8..d1d75a545 100644
--- a/src/modules/terminalfont.c
+++ b/src/modules/terminalfont.c
@@ -16,8 +16,7 @@ static void printTerminalFont(FFinstance* instance, char* font)
             (FFformatarg){FF_FORMAT_ARG_TYPE_STRING, font}
         );
 
-        ffStrbufWriteTo(&termfont, stdout);
-        putchar('\n');
+        ffStrbufPutTo(&termfont, stdout);
         ffStrbufDestroy(&termfont);
     }
 }
diff --git a/src/modules/theme.c b/src/modules/theme.c
index 2009faa6e..c5e38e9d8 100644
--- a/src/modules/theme.c
+++ b/src/modules/theme.c
@@ -30,7 +30,7 @@ void ffPrintTheme(FFinstance* instance)
         if(plasma[0] != '\0')
             printf("%s [Plasma], ", plasma);
 
-        ffStrbufWriteTo(&gtkPretty, stdout);
+        ffStrbufPutTo(&gtkPretty, stdout);
     }
     else
     {
@@ -44,10 +44,7 @@ void ffPrintTheme(FFinstance* instance)
             (FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &gtkPretty}
         );
 
-        ffStrbufWriteTo(&theme, stdout);
-
+        ffStrbufPutTo(&theme, stdout);
         ffStrbufDestroy(&theme);
     }
-    
-    putchar('\n');
 }
\ No newline at end of file
diff --git a/src/modules/uptime.c b/src/modules/uptime.c
index db46aa2b1..be854fba2 100644
--- a/src/modules/uptime.c
+++ b/src/modules/uptime.c
@@ -39,7 +39,7 @@ void ffPrintUptime(FFinstance* instance)
         );
 
         ffPrintLogoAndKey(instance, "Uptime");
-        ffStrbufWriteTo(&uptime, stdout);
+        ffStrbufPutTo(&uptime, stdout);
         ffStrbufDestroy(&uptime);
     }
 }
\ No newline at end of file
diff --git a/src/modules/wm.c b/src/modules/wm.c
index b652b58e4..45e78338a 100644
--- a/src/modules/wm.c
+++ b/src/modules/wm.c
@@ -52,7 +52,7 @@ void ffPrintWM(FFinstance* instance)
     if(ffStrbufIsEmpty(&instance->config.wmFormat))
     {
         ffPrintLogoAndKey(instance, "WM");
-        ffStrbufWriteTo(&name, stdout);
+        ffStrbufPutTo(&name, stdout);
     }
     else
     {
@@ -63,11 +63,9 @@ void ffPrintWM(FFinstance* instance)
         );
 
         ffPrintLogoAndKey(instance, "WM");
-        ffStrbufWriteTo(&wm, stdout);
-        
+        ffStrbufPutTo(&wm, stdout);
         ffStrbufDestroy(&wm);
     }
 
-    putchar('\n');
     ffStrbufDestroy(&name);
 }
\ No newline at end of file
diff --git a/src/util/FFstrbuf.c b/src/util/FFstrbuf.c
index b890df8e5..96a077518 100644
--- a/src/util/FFstrbuf.c
+++ b/src/util/FFstrbuf.c
@@ -238,6 +238,12 @@ void ffStrbufWriteTo(FFstrbuf* strbuf, FILE* file)
     fwrite(strbuf->chars, sizeof(char), strbuf->length, file);
 }
 
+void ffStrbufPutTo(FFstrbuf* strbuf, FILE* file)
+{
+    fwrite(strbuf->chars, sizeof(char), strbuf->length, file);
+    fputc('\n', file);
+}
+
 int ffStrbufComp(FFstrbuf* strbuf, const FFstrbuf* comp)
 {
     return ffStrbufCompNS(strbuf, comp->length, comp->chars);
diff --git a/src/util/FFstrbuf.h b/src/util/FFstrbuf.h
index 4e3f9002e..dc5d3b0c3 100644
--- a/src/util/FFstrbuf.h
+++ b/src/util/FFstrbuf.h
@@ -54,6 +54,7 @@ void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments);
 char ffStrbufGetC(FFstrbuf* strbuf, uint32_t index);
 
 void ffStrbufWriteTo(FFstrbuf* strbuf, FILE* file);
+void ffStrbufPutTo(FFstrbuf* strbuf, FILE* file);
 
 int ffStrbufComp(FFstrbuf* strbuf, const FFstrbuf* comp);
 int ffStrbufCompS(FFstrbuf* strbuf, const char* comp);