diff options
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/os/xprintf.c | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/nx-X11/programs/Xserver/os/xprintf.c b/nx-X11/programs/Xserver/os/xprintf.c index 2b10e6eba..1aeacad6d 100644 --- a/nx-X11/programs/Xserver/os/xprintf.c +++ b/nx-X11/programs/Xserver/os/xprintf.c @@ -89,54 +89,7 @@ #undef TEST #undef DEBUG -#define START_SIZE 256 -#define END_SIZE 2048 - -int -Xvasprintf(char **ret, const char *_X_RESTRICT_KYWD format, va_list va) -{ - char *newret; - int size; - int r; - - size = 0; - - for (;;) - { - if (size == 0) - { - *ret = (char *)malloc(START_SIZE); - if (*ret == NULL) - return -1; - size = START_SIZE; - } - else if (size < END_SIZE && - (newret = (char *) realloc(*ret, 2 * size)) != NULL) - { - *ret = newret; - size = 2 * size; - } - else - { - free(*ret); - return -1; - } - - r = vsnprintf(*ret, size, format, va); - - if (r == -1 || r == size || r > size || r == size - 1) - { - continue; - } - else - { - (*ret)[r] = 0; - return r; - } - } -} - -#else +#endif /** * Varargs sprintf that allocates a string buffer the right size for @@ -171,8 +124,6 @@ Xvasprintf(char **ret, const char *_X_RESTRICT_KYWD format, va_list va) #endif } -#endif - #ifndef HAVE_VASPRINTF #define vasprintf Xvasprintf #endif |