On 25/07/2011 23:06, Peter Hutterer wrote:
On Mon, Jul 25, 2011 at 09:28:53AM +0100, Daniel Stone wrote:
On Wed, Jul 20, 2011 at 01:17:43PM +1000, Peter Hutterer wrote:
Instead of just closing the log when everything is done, put one more
message in stating that we're actually terminating. Users or scripts that
look at the Xorg.log will then know that a) the server has terminated
properly and b) why the server terminated (to some degree, given that most
real-world errors will be caused by AbortServer()).
Signed-off-by: Peter
Hutterer<[email protected]>
Reviewed-by: Daniel Stone<daniel-rLtY4a/8tF1rovVCs/[email protected]>
Thanks. Jeremy, can you let this patch go through your tree, just so we're
sure it didn't break XQuartz.
Jon, if you could test this for XWin too that'd be much appreciated.
Squash the attached into your commit, please.
Seems to do the right thing, so Tested-by: & Reviewed-by:
>From ca8b6e2af7d5b9e74846b07c9b46dc04e9122c1c Mon Sep 17 00:00:00 2001
From: Jon TURNEY <[email protected]>
Date: Tue, 26 Jul 2011 13:20:35 +0100
Subject: [PATCH] Fix xwin compilation for LogClose() change
Signed-off-by: Jon TURNEY <[email protected]>
---
hw/xwin/InitOutput.c | 4 ++--
hw/xwin/winerror.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 756fcd3..4fe5053 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -228,7 +228,7 @@ ddxGiveUp (enum ExitCode error)
g_pszLogFile = LogInit (g_pszLogFile, NULL);
g_fLogInited = TRUE;
}
- LogClose ();
+ LogClose (error);
/*
* At this point we aren't creating any new screens, so
@@ -901,7 +901,7 @@ ddxUseMsg(void)
g_pszLogFile = LogInit (g_pszLogFile, NULL);
g_fLogInited = TRUE;
}
- LogClose ();
+ LogClose (EXIT_NO_ERROR);
/* Notify user where UseMsg text can be found.*/
if (!g_fNoHelpMessageBox)
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
index 5e32d09..0440d13 100644
--- a/hw/xwin/winerror.c
+++ b/hw/xwin/winerror.c
@@ -81,7 +81,7 @@ OsVendorFatalError (void)
g_fLogInited = TRUE;
g_pszLogFile = LogInit (g_pszLogFile, NULL);
}
- LogClose ();
+ LogClose (EXIT_ERR_ABORT);
winMessageBoxF (
"A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \
--
1.7.5.1
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
