deduplicate Sys_Print()

Signed-off-by: bones_was_here <bones_was_here@xonotic.au>

diff --git a/sys_sdl.c b/sys_sdl.c
index bb9bb2b1703bb33bee8038c94f4ee9fc8676b94d..cec67c8f67b92e5793a8dbb4f04d6e480de61ecf 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,15 +1,9 @@
 #ifdef WIN32
-#include <io.h> // Include this BEFORE darkplaces.h because it uses strncpy which trips DP_STATIC_ASSERT
 #else
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #endif
 
-#ifdef __ANDROID__
-#include <android/log.h>
-#endif
-
 /*
  * Include this BEFORE darkplaces.h because it breaks wrapping
  * _Static_assert. Cloudwalk has no idea how or why so don't ask.
@@ -52,41 +46,6 @@ void Sys_SDL_Dialog(const char *title, const char *string)
                SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, string, NULL);
 }
 
-void Sys_Print(const char *text)
-{
-#ifdef __ANDROID__
-       if (developer.integer > 0)
-       {
-               __android_log_write(ANDROID_LOG_DEBUG, sys.argv[0], text);
-       }
-#else
-       if(sys.outfd < 0)
-               return;
-#ifndef WIN32
-       // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
-       // this is because both go to /dev/tty by default!
-       {
-               int origflags = fcntl (sys.outfd, F_GETFL, 0);
-               fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
-#endif
-#ifdef WIN32
-#define write _write
-#endif
-               while(*text)
-               {
-                       fs_offset_t written = (fs_offset_t)write(sys.outfd, text, (int)strlen(text));
-                       if(written <= 0)
-                               break; // sorry, I cannot do anything about this error - without an output
-                       text += written;
-               }
-#ifndef WIN32
-               fcntl (sys.outfd, F_SETFL, origflags);
-       }
-#endif
-       //fprintf(stdout, "%s", text);
-#endif
-}
-
 char *Sys_GetClipboardData (void)
 {
        char *data = NULL;

diff --git a/sys_shared.c b/sys_shared.c
index aa028fdddc77b3a428263fd8d96717739a64e06d..bb7ce9ce8504665c854625ef38dcd5443383f0d9 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -4,11 +4,6 @@
 # endif
 #endif
 
-#include "quakedef.h"
-#include "taskqueue.h"
-#include "thread.h"
-#include "libcurl.h"
-
 #define SUPPORTDLL
 
 #ifdef WIN32
@@ -16,6 +11,7 @@
 # include <mmsystem.h> // timeGetTime
 # include <time.h> // localtime
 # include <conio.h> // _kbhit, _getch, _putch
+# include <io.h> // write; Include this BEFORE darkplaces.h because it uses strncpy which trips DP_STATIC_ASSERT
 #ifdef _MSC_VER
 #pragma comment(lib, "winmm.lib")
 #endif
@@ -23,6 +19,9 @@
 # ifdef __FreeBSD__
 #  include <sys/sysctl.h>
 # endif
+# ifdef __ANDROID__
+#  include <android/log.h>
+# endif
 # include <unistd.h>
 # include <fcntl.h>
 # include <sys/time.h>
@@ -34,6 +33,11 @@
 
 #include <signal.h>
 
+#include "quakedef.h"
+#include "taskqueue.h"
+#include "thread.h"
+#include "libcurl.h"
+
 static char sys_timestring[128];
 char *Sys_TimeString(const char *timeformat)
 {
@@ -543,6 +547,40 @@ double Sys_Sleep(double time)
        return (dt < 0 || dt >= 1800) ? 0 : dt;
 }
 
+void Sys_Print(const char *text)
+{
+#ifdef __ANDROID__
+       if (developer.integer > 0)
+       {
+               __android_log_write(ANDROID_LOG_DEBUG, sys.argv[0], text);
+       }
+#else
+       if(sys.outfd < 0)
+               return;
+  #ifndef WIN32
+       // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
+       // this is because both go to /dev/tty by default!
+       {
+               int origflags = fcntl (sys.outfd, F_GETFL, 0);
+               fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
+  #else
+    #define write _write
+  #endif
+               while(*text)
+               {
+                       fs_offset_t written = (fs_offset_t)write(sys.outfd, text, (int)strlen(text));
+                       if(written <= 0)
+                               break; // sorry, I cannot do anything about this error - without an output
+                       text += written;
+               }
+  #ifndef WIN32
+               fcntl (sys.outfd, F_SETFL, origflags);
+       }
+  #endif
+       //fprintf(stdout, "%s", text);
+#endif
+}
+
 void Sys_Printf(const char *fmt, ...)
 {
        va_list argptr;

diff --git a/sys_unix.c b/sys_unix.c
index 86a373c9ef82829e70630bd9b457c91f2d5c3e82..e041cce0bfd924e23bb17dbbd7a3f5ef29bdcc3d 100644 (file)
--- a/sys_unix.c
+++ b/sys_unix.c
@@ -2,10 +2,8 @@
 #ifdef WIN32
 #include <windows.h>
 #include <mmsystem.h>
-#include <io.h>
 #else
 #include <sys/time.h>
-#include <unistd.h>
 #include <fcntl.h>
 #endif
 
@@ -28,33 +26,6 @@ void Sys_SDL_Dialog(const char *title, const char *string)
 {
 }
 
-void Sys_Print(const char *text)
-{
-       if(sys.outfd < 0)
-               return;
-       // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
-       // this is because both go to /dev/tty by default!
-       {
-#ifndef WIN32
-               int origflags = fcntl (sys.outfd, F_GETFL, 0);
-               fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
-#else
-#define write _write
-#endif
-               while(*text)
-               {
-                       fs_offset_t written = (fs_offset_t)write(sys.outfd, text, (int)strlen(text));
-                       if(written <= 0)
-                               break; // sorry, I cannot do anything about this error - without an output
-                       text += written;
-               }
-#ifndef WIN32
-               fcntl (sys.outfd, F_SETFL, origflags);
-#endif
-       }
-       //fprintf(stdout, "%s", text);
-}
-
 char *Sys_GetClipboardData (void)
 {
        return NULL;