summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2017-11-20 14:28:13 -0500
committerAdam Jackson <ajax@redhat.com>2018-09-28 16:25:12 -0400
commita23eba2a91024d27da45e5aee1f4215f7ec2ae82 (patch)
treefeca8c7ccfdf82d5fa7a5f588d47e793a21df04b /os
parentd78ac2f15913bf6f00e06986cc7db0ade9ebd806 (diff)
downloadxserver-a23eba2a91024d27da45e5aee1f4215f7ec2ae82.tar.gz
dix: Merge AbortDDX into ddxGiveUp
These are so close to identical that most DDXes implement one in terms of the other. All the relevant cases can be distinguished by the error code, so merge the functions together to make things simpler. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'os')
-rw-r--r--os/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/os/log.c b/os/log.c
index a3b28ccb4..8576955fc 100644
--- a/os/log.c
+++ b/os/log.c
@@ -871,7 +871,7 @@ AbortServer(void)
CloseWellKnownConnections();
OsCleanup(TRUE);
AbortDevices();
- AbortDDX(EXIT_ERR_ABORT);
+ ddxGiveUp(EXIT_ERR_ABORT);
fflush(stderr);
if (CoreDump)
OsAbort();