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

Xext: selinux: use static reply struct init on declaration 

Make the code a bit easier to read by using initialization of the reply
structs, at the point of declaration. Most of them aren't written to later,
just passed into WriteReplyToClient(). Also dropping some useless zero
assignments (struct initializers automatically zero-out unmentioned fields).

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1795>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-17 12:27:18 +02:00 committed by Marge Bot
parent 94d942267a
commit f4d878086e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Xext/xselinux_ext.c
View File

@ -70,7 +70,6 @@ ProcSELinuxQueryVersion(ClientPtr client)
SELinuxQueryVersionReply rep = { SELinuxQueryVersionReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.length = 0,
.server_major = SELINUX_MAJOR_VERSION, .server_major = SELINUX_MAJOR_VERSION,
.server_minor = SELINUX_MINOR_VERSION .server_minor = SELINUX_MINOR_VERSION
}; };
@ -87,7 +86,6 @@ ProcSELinuxQueryVersion(ClientPtr client)
static int static int
SELinuxSendContextReply(ClientPtr client, security_id_t sid) SELinuxSendContextReply(ClientPtr client, security_id_t sid)
{ {
SELinuxGetContextReply rep;
char *ctx = NULL; char *ctx = NULL;
int len = 0; int len = 0;
@ -97,7 +95,7 @@ SELinuxSendContextReply(ClientPtr client, security_id_t sid)
len = strlen(ctx) + 1; len = strlen(ctx) + 1;
} }
rep = (SELinuxGetContextReply) { SELinuxGetContextReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.length = bytes_to_int32(len), .length = bytes_to_int32(len),
@ -344,13 +342,9 @@ static int
SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec * items, SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec * items,
int size, int count) int size, int count)
{ {
int rc, k, pos = 0; int rc = BadAlloc, k, pos = 0;
SELinuxListItemsReply rep; CARD32 *buf = calloc(size, sizeof(CARD32));
CARD32 *buf;
buf = calloc(size, sizeof(CARD32));
if (size && !buf) { if (size && !buf) {
rc = BadAlloc;
goto out; goto out;
} }
@ -378,7 +372,7 @@ SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec * items,
} }
/* Send reply to client */ /* Send reply to client */
rep = (SELinuxListItemsReply) { SELinuxListItemsReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.length = size, .length = size,