diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index a8e5073b6..11ffcee10 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -829,11 +829,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) if ((s = xf86GetOptValString(FlagOptions, FLAG_LOG))) { if (!xf86NameCmp(s, "flush")) { LogMessageVerb(X_CONFIG, 1, "Flushing logfile enabled\n"); - LogSetParameter(XLOG_FLUSH, TRUE); } else if (!xf86NameCmp(s, "sync")) { LogMessageVerb(X_CONFIG, 1, "Syncing logfile enabled\n"); - LogSetParameter(XLOG_FLUSH, TRUE); LogSetParameter(XLOG_SYNC, TRUE); } else { diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index de7a3f466..d8046d6d1 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -638,7 +638,6 @@ OsVendorInit(void) g_pszLogFile = LogInit(g_pszLogFile, ".old"); } - LogSetParameter(XLOG_FLUSH, 1); LogSetParameter(XLOG_VERBOSITY, g_iLogVerbose); LogSetParameter(XLOG_FILE_VERBOSITY, g_iLogVerbose); diff --git a/include/os.h b/include/os.h index d8506eddd..b2594eef5 100644 --- a/include/os.h +++ b/include/os.h @@ -271,7 +271,6 @@ timingsafe_memcmp(const void *b1, const void *b2, size_t len); /* Logging. */ typedef enum _LogParameter { - XLOG_FLUSH, XLOG_SYNC, XLOG_VERBOSITY, XLOG_FILE_VERBOSITY diff --git a/os/log.c b/os/log.c index 392f33198..071734c87 100644 --- a/os/log.c +++ b/os/log.c @@ -111,7 +111,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #define DEFAULT_LOG_FILE_VERBOSITY 3 static int logFileFd = -1; -static Bool logFlush = FALSE; static Bool logSync = FALSE; static int logVerbosity = DEFAULT_LOG_VERBOSITY; static int logFileVerbosity = DEFAULT_LOG_FILE_VERBOSITY; @@ -310,9 +309,6 @@ Bool LogSetParameter(LogParameter param, int value) { switch (param) { - case XLOG_FLUSH: - logFlush = value ? TRUE : FALSE; - return TRUE; case XLOG_SYNC: logSync = value ? TRUE : FALSE; return TRUE; @@ -561,7 +557,7 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line) if (inSignalContext && logFileFd >= 0) { ret = write(logFileFd, buf, len); #ifndef WIN32 - if (logFlush && logSync) + if (logSync) fsync(logFileFd); #endif } @@ -577,12 +573,10 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line) } newline = end_line; write(logFileFd, buf, len); - if (logFlush) { #ifndef WIN32 - if (logSync) - fsync(logFileFd); + if (logSync) + fsync(logFileFd); #endif - } } else if (!inSignalContext && needBuffer) { if (len > bufferUnused) {