From 8ca929a021035093c9f8a7e2b8fdd41b8ef94c6e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 9 Jul 2024 11:57:20 +0200 Subject: [PATCH] damage: use REPLY_*() macros for preparing / sending replies Use the new macros for preparing and sending replies to clients. Signed-off-by: Enrico Weigelt, metux IT consult --- damageext/damageext.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/damageext/damageext.c b/damageext/damageext.c index dc79c9cce..7eb1bae83 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -187,10 +187,7 @@ ProcDamageQueryVersion(ClientPtr client) REQUEST_FIELD_CARD32(minorVersion); DamageClientPtr pDamageClient = GetDamageClient(client); - xDamageQueryVersionReply rep = { - .type = X_Reply, - .sequenceNumber = client->sequence, - }; + xDamageQueryVersionReply rep = { 0 }; if (stuff->majorVersion < SERVER_DAMAGE_MAJOR_VERSION) { rep.majorVersion = stuff->majorVersion; @@ -206,14 +203,10 @@ ProcDamageQueryVersion(ClientPtr client) } pDamageClient->major_version = rep.majorVersion; pDamageClient->minor_version = rep.minorVersion; - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.majorVersion); - swapl(&rep.minorVersion); - } - WriteToClient(client, sizeof(xDamageQueryVersionReply), &rep); - return Success; + + REPLY_FIELD_CARD32(majorVersion); + REPLY_FIELD_CARD32(minorVersion); + REPLY_SEND_RET_SUCCESS(); } static void