frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: localize two variables 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2022-12-20 11:40:16 +10:00
parent a8c2e60d8d
commit f69280ddcd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/dispatch.c
View File

@ -3766,14 +3766,11 @@ int
ProcEstablishConnection(ClientPtr client) ProcEstablishConnection(ClientPtr client)
{ {
const char *reason; const char *reason;
char *auth_proto, *auth_string;
xConnClientPrefix *prefix; xConnClientPrefix *prefix;
REQUEST(xReq); REQUEST(xReq);
prefix = (xConnClientPrefix *) ((char *) stuff + sz_xReq); prefix = (xConnClientPrefix *) ((char *) stuff + sz_xReq);
auth_proto = (char *) prefix + sz_xConnClientPrefix;
auth_string = auth_proto + pad_to_int32(prefix->nbytesAuthProto);
if ((client->req_len << 2) != sz_xReq + sz_xConnClientPrefix + if ((client->req_len << 2) != sz_xReq + sz_xConnClientPrefix +
pad_to_int32(prefix->nbytesAuthProto) + pad_to_int32(prefix->nbytesAuthProto) +
@ -3782,12 +3779,15 @@ ProcEstablishConnection(ClientPtr client)
else if ((prefix->majorVersion != X_PROTOCOL) || else if ((prefix->majorVersion != X_PROTOCOL) ||
(prefix->minorVersion != X_PROTOCOL_REVISION)) (prefix->minorVersion != X_PROTOCOL_REVISION))
reason = "Protocol version mismatch"; reason = "Protocol version mismatch";
else else {
char *auth_proto = (char *) prefix + sz_xConnClientPrefix;
char *auth_string = auth_proto + pad_to_int32(prefix->nbytesAuthProto);
reason = ClientAuthorized(client, reason = ClientAuthorized(client,
(unsigned short) prefix->nbytesAuthProto, (unsigned short) prefix->nbytesAuthProto,
auth_proto, auth_proto,
(unsigned short) prefix->nbytesAuthString, (unsigned short) prefix->nbytesAuthString,
auth_string); auth_string);
}
return (SendConnSetup(client, reason)); return (SendConnSetup(client, reason));
} }