print error messages if syslog support is built but disabled

Also ensure we always call va_end() before returning

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/app/xfs/-/merge_requests/7>

1 files changed, 10 insertions, 8 deletions

diff --git a/os/error.c b/os/error.c
index 2ab84f6..61dc185 100644
--- a/os/error.c
+++ b/os/error.c
@@ -170,12 +170,13 @@ ErrorF(const char * f, ...)
 #ifdef USE_SYSLOG
     if (UseSyslog) {
 	vsyslog(LOG_WARNING, f, args);
-	return;
     }
-#else
-    fprintf(stderr, "%s error: ", progname);
-    vfprintf(stderr, f, args);
+    else
 #endif
+    {
+	fprintf(stderr, "%s error: ", progname);
+	vfprintf(stderr, f, args);
+    }
     va_end(args);
 }
 
@@ -187,12 +188,13 @@ FatalError(const char * f, ...)
 #ifdef USE_SYSLOG
     if (UseSyslog) {
 	vsyslog(LOG_ERR, f, args);
-	return;
     }
-#else
-    fprintf(stderr, "%s fatal error: ", progname);
-    vfprintf(stderr, f, args);
+    else
 #endif
+    {
+	fprintf(stderr, "%s fatal error: ", progname);
+	vfprintf(stderr, f, args);
+    }
     va_end(args);
     abort_server();
     /* NOTREACHED */