aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os/osinit.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-04 10:36:18 +0200
committermarha <marha@users.sourceforge.net>2012-07-04 10:36:18 +0200
commitfc8f37239f3af088819c18f5632b2608954af73a (patch)
tree012ded3d00546b7f2fa807f466643eadf6f815ba /xorg-server/os/osinit.c
parentfdef5bff99e6079f64bc6b91c91b42195c85adeb (diff)
downloadvcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.tar.gz
vcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.tar.bz2
vcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.zip
mesa xserver git update 4 Jul 2012
Diffstat (limited to 'xorg-server/os/osinit.c')
-rw-r--r--xorg-server/os/osinit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c
index e2a220886..6cc040178 100644
--- a/xorg-server/os/osinit.c
+++ b/xorg-server/os/osinit.c
@@ -113,7 +113,7 @@ OsSigHandler(int signo)
const char *dlerr = dlerror();
if (dlerr) {
- LogMessage(X_ERROR, "Dynamic loader error: %s\n", dlerr);
+ LogMessageVerbSigSafe(X_ERROR, 1, "Dynamic loader error: %s\n", dlerr);
}
#endif /* RTLD_DI_SETSIGNAL */
@@ -129,8 +129,8 @@ OsSigHandler(int signo)
#ifdef SA_SIGINFO
if (sip->si_code == SI_USER) {
- ErrorF("Recieved signal %d sent by process %ld, uid %ld\n",
- signo, (long) sip->si_pid, (long) sip->si_uid);
+ ErrorFSigSafe("Recieved signal %u sent by process %u, uid %u\n", signo,
+ sip->si_pid, sip->si_uid);
}
else {
switch (signo) {
@@ -138,7 +138,7 @@ OsSigHandler(int signo)
case SIGBUS:
case SIGILL:
case SIGFPE:
- ErrorF("%s at address %p\n", strsignal(signo), sip->si_addr);
+ ErrorFSigSafe("%s at address %p\n", strsignal(signo), sip->si_addr);
}
}
#endif