From 7d3e56722c5fb3ab1e08209be121c69c2b8e1d26 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 10 Sep 2024 12:43:55 +0200
Subject: [PATCH] os: log: consolidate OS specific fsync() call into helper

Instead of having lots of #ifdef's, consolidating the conditionally
compiled fsync() call into a tiny inline helper.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 os/log.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/os/log.c b/os/log.c
index 071734c87..69b0bb6ca 100644
--- a/os/log.c
+++ b/os/log.c
@@ -199,6 +199,12 @@ LogFilePrep(const char *fname, const char *backup, const char *idstring)
 }
 #pragma GCC diagnostic pop
 
+static inline void doLogSync(void) {
+#ifndef WIN32
+    fsync(logFileFd);
+#endif
+}
+
 /*
  * LogInit is called to start logging to a file.  It is also called (with
  * NULL arguments) when logging to a file is not wanted.  It must always be
@@ -241,9 +247,7 @@ LogInit(const char *fname, const char *backup)
         /* Flush saved log information. */
         if (saveBuffer && bufferSize > 0) {
             write(logFileFd, saveBuffer, bufferPos);
-#ifndef WIN32
-            fsync(logFileFd);
-#endif
+            doLogSync();
         }
     }
 
@@ -556,10 +560,8 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
     if (verb < 0 || logFileVerbosity >= verb) {
         if (inSignalContext && logFileFd >= 0) {
             ret = write(logFileFd, buf, len);
-#ifndef WIN32
             if (logSync)
-                fsync(logFileFd);
-#endif
+                doLogSync();
         }
         else if (!inSignalContext && logFileFd != -1) {
             if (newline) {
@@ -573,10 +575,8 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
             }
             newline = end_line;
             write(logFileFd, buf, len);
-#ifndef WIN32
             if (logSync)
-                fsync(logFileFd);
-#endif
+                doLogSync();
         }
         else if (!inSignalContext && needBuffer) {
             if (len > bufferUnused) {