diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-10 19:06:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-10 19:06:59 +0000 |
| commit | 3a20d23b48c1051e1f22295fd886cc7f643417f6 (patch) | |
| tree | 5192dddd9ecf591de2e22504f7268c2935382d90 /xorg-server/hw/xwin/winerror.c | |
| parent | 531a0d974b98074978535f086a73b6b662fa0cea (diff) | |
| download | vcxsrv-3a20d23b48c1051e1f22295fd886cc7f643417f6.tar.gz vcxsrv-3a20d23b48c1051e1f22295fd886cc7f643417f6.tar.bz2 vcxsrv-3a20d23b48c1051e1f22295fd886cc7f643417f6.zip | |
xserver git update 10/12/2010
Diffstat (limited to 'xorg-server/hw/xwin/winerror.c')
| -rw-r--r-- | xorg-server/hw/xwin/winerror.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c index 1ee8c572f..988c5952e 100644 --- a/xorg-server/hw/xwin/winerror.c +++ b/xorg-server/hw/xwin/winerror.c @@ -101,12 +101,15 @@ winMessageBoxF (const char *pszError, UINT uType, ...) char * pszErrorF = NULL;
char * pszMsgBox = NULL;
va_list args;
+ int size;
va_start(args, uType);
- pszErrorF = Xvprintf(pszError, args);
+ size = vasprintf (&pszErrorF, pszError, args);
va_end(args);
- if (!pszErrorF)
+ if (size == -1) {
+ pszErrorF = NULL;
goto winMessageBoxF_Cleanup;
+ }
#define MESSAGEBOXF \
"%s\n" \
@@ -117,15 +120,18 @@ winMessageBoxF (const char *pszError, UINT uType, ...) "XWin was started with the following command-line:\n\n" \
"%s\n"
- pszMsgBox = Xprintf (MESSAGEBOXF,
- pszErrorF, XVENDORNAME,
- XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT,
- BUILDERADDR,
- BUILDERSTRING,
- g_pszCommandLine);
+ size = asprintf (&pszMsgBox, MESSAGEBOXF,
+ pszErrorF, XVENDORNAME,
+ XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH,
+ XORG_VERSION_SNAP, XORG_VERSION_CURRENT,
+ BUILDERADDR,
+ BUILDERSTRING,
+ g_pszCommandLine);
- if (!pszMsgBox)
+ if (size == -1) {
+ pszMsgBox = NULL;
goto winMessageBoxF_Cleanup;
+ }
/* Display the message box string */
MessageBox (NULL,
|