diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2017-12-07 10:48:31 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-10 12:17:10 +0100 |
| commit | 1e3a97482840401af9ffcf73db6008ebfe6c1d52 (patch) | |
| tree | ca426e505e58c47e87a1974efb563491bea65d10 /nx-X11/programs/Xserver/include/os.h | |
| parent | 804ff44523ab726fdb59b80193652465df0482ee (diff) | |
| download | nx-libs-1e3a97482840401af9ffcf73db6008ebfe6c1d52.tar.gz nx-libs-1e3a97482840401af9ffcf73db6008ebfe6c1d52.tar.bz2 nx-libs-1e3a97482840401af9ffcf73db6008ebfe6c1d52.zip | |
Add asprintf() implementation for platforms without it
Backported from X.org:
commit c95c1d338fdb62dbe3dba934b97324fa778b7fce
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 18:43:12 2010 -0800
Add asprintf() implementation for platforms without it
Provides a portable implementation of this common allocating sprintf()
API found in many, but not yet all, of the platforms we support.
If the platform provides vasprintf() we simply wrap it, otherwise we
implement it - either way callers can use it regardless of platform.
Since not all platforms guarantee to NULL out the return pointer on
failure, we don't either, and require callers to check the return
value for -1.
The old Xprintf() API is deprecated, but left for compatibility for now.
The new API is added in a new header so that it can be used in parts of
the server such as hw/xfree86/parser that don't include all the server
headers.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Includes re-indentation changes from
9838b7032ea9792bec21af424c53c07078636d21.
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
Diffstat (limited to 'nx-X11/programs/Xserver/include/os.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/os.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index 0c7ce6a6f..be41e0118 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -230,10 +230,15 @@ extern void OsInitAllocator(void); extern char *Xstrdup(const char *s); extern char *XNFstrdup(const char *s); -extern char *Xprintf(const char *fmt, ...); -extern char *Xvprintf(const char *fmt, va_list va); -extern char *XNFprintf(const char *fmt, ...); -extern char *XNFvprintf(const char *fmt, va_list va); + +/* Include new X*asprintf API */ +#include "Xprintf.h" + +/* Older api deprecated in favor of the asprintf versions */ +extern _X_EXPORT char *Xprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED; +extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED; +extern _X_EXPORT char *XNFprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED; +extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED; typedef SIGVAL (*OsSigHandlerPtr)(int /* sig */); |