From 60d37d0158ad9e1c29e4740e73911083e218c332 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 26 Feb 2025 11:21:29 +0100
Subject: [PATCH] xkb: make XkbRF_Create() static inline

The function is nothing more than a calloc() call, so we can spare
an actual function call here by making it static inline.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1840>
---
 xkb/maprules.c      | 10 ----------
 xkb/xkbrules_priv.h |  6 +++++-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/xkb/maprules.c b/xkb/maprules.c
index 83abe8076..9c6f7c2b3 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -970,16 +970,6 @@ XkbRF_LoadRules(FILE * file, XkbRF_RulesPtr rules)
     return TRUE;
 }
 
-/***====================================================================***/
-
-XkbRF_RulesPtr
-XkbRF_Create(void)
-{
-    return calloc(1, sizeof(XkbRF_RulesRec));
-}
-
-/***====================================================================***/
-
 void
 XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
 {
diff --git a/xkb/xkbrules_priv.h b/xkb/xkbrules_priv.h
index b494edb8d..3739c15a8 100644
--- a/xkb/xkbrules_priv.h
+++ b/xkb/xkbrules_priv.h
@@ -6,6 +6,7 @@
 #define _XSERVER_XKB_XKBRULES_PRIV_H
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xdefs.h>
 
 #include "include/xkbrules.h"
@@ -50,7 +51,10 @@ Bool XkbRF_GetComponents(XkbRF_RulesPtr rules,
 
 Bool XkbRF_LoadRules(FILE *file, XkbRF_RulesPtr rules);
 
-XkbRF_RulesPtr XkbRF_Create(void);
+static inline XkbRF_RulesPtr XkbRF_Create(void)
+{
+    return calloc(1, sizeof(XkbRF_RulesRec));
+}
 
 void XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules);