From c8eb053206e80b34a11958f87f56edb5fd99639b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 10 Mar 2025 15:02:45 +0100 Subject: [PATCH] os: xdmcp: simplify AddAuth handler call No need for loading the address into temporary variable and later doing indirect call, since we can easily do direct call in each branch. Signed-off-by: Enrico Weigelt, metux IT consult --- os/xdmcp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/os/xdmcp.c b/os/xdmcp.c index e014daeea3..b4cde1abed 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -902,13 +902,14 @@ XdmcpCheckAuthentication(ARRAY8Ptr Name, ARRAY8Ptr Data, int packet_type) static int XdmcpAddAuthorization(ARRAY8Ptr name, ARRAY8Ptr data) { - AddAuthorFunc AddAuth; - if (AuthenticationFuncs && AuthenticationFuncs->AddAuth) - AddAuth = AuthenticationFuncs->AddAuth; + return AuthenticationFuncs->AddAuth( + (unsigned short) name->length, + (char *) name->data, + (unsigned short) data->length, (char *) data->data); else - AddAuth = AddAuthorization; - return (*AddAuth) ((unsigned short) name->length, + return AddAuthorization( + (unsigned short) name->length, (char *) name->data, (unsigned short) data->length, (char *) data->data); }