diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
commit | d14cc5361f7db7016b7cbb1cc59d8500101d9f27 (patch) | |
tree | 28bb620b5a39a9f649393e5ad113b07089fafe2b /doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_os_xprintf.c.X.original | |
parent | 74a52dd354cc638c9f5fdedb0606b3b69e2b488a (diff) | |
download | nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.gz nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.bz2 nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.zip |
doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_os_xprintf.c.X.original')
-rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_os_xprintf.c.X.original | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_os_xprintf.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_os_xprintf.c.X.original deleted file mode 100644 index fa0796dc9..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_os_xprintf.c.X.original +++ /dev/null @@ -1,75 +0,0 @@ ---- ./nx-X11/programs/Xserver/os/xprintf.c.X.original 2015-02-13 14:03:44.792440567 +0100 -+++ ./nx-X11/programs/Xserver/os/xprintf.c 2015-02-10 19:13:13.480698017 +0100 -@@ -43,6 +43,63 @@ - # endif - #endif - -+#ifdef NX_TRANS_SOCKET -+ -+#define PANIC -+#define WARNING -+#undef TEST -+#undef DEBUG -+ -+#define START_SIZE 256 -+#define END_SIZE 2048 -+ -+char * -+Xvprintf(const char *format, va_list va) -+{ -+ char *ret; -+ char *newret; -+ int size; -+ int r; -+ -+ size = 0; -+ -+ for (;;) -+ { -+ if (size == 0) -+ { -+ ret = (char *)malloc(START_SIZE); -+ if (ret == NULL) -+ return NULL; -+ size = START_SIZE; -+ } -+ else if (size < END_SIZE && -+ (newret = (char *) realloc(ret, 2 * size)) != NULL) -+ { -+ ret = newret; -+ size = 2 * size; -+ } -+ else -+ { -+ free(ret); -+ return NULL; -+ } -+ -+ r = vsnprintf(ret, size, format, va); -+ -+ if (r == -1 || r == size || r > size || r == size - 1) -+ { -+ continue; -+ } -+ else -+ { -+ ret[r] = 0; -+ return ret; -+ } -+ } -+} -+ -+#else -+ - char * - Xvprintf(const char *format, va_list va) - { -@@ -63,6 +120,8 @@ - return ret; - } - -+#endif -+ - char *Xprintf(const char *format, ...) - { - char *ret; |