[10/16] use XNFalloc() instead of xnfalloc

Commit Message

Enrico Weigelt, metux IT consult March 4, 2025, 3:58 p.m. UTC

xnfalloc is just an alias for XNFalloc() that doesn't seem to serve
any practical purpose, so it can go away once all drivers stopped using it.

Signed-off-by: Enrico Weigelt, metux IT consult <[e-mail]>
---
 src/sna/sna_video_overlay.c   | 2 +-
 src/sna/sna_video_sprite.c    | 2 +-
 src/sna/sna_video_textured.c  | 2 +-
 src/uxa/intel_uxa_video.c     | 2 +-
 src/uxa/intel_video_overlay.c | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

--
2.39.5

Patch

diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index 07964871..5989b261 100644
--- a/src/sna/sna_video_overlay.c
+++ b/src/sna/sna_video_overlay.c
@@ -723,7 +723,7 @@  void sna_video_overlay_setup(struct sna *sna, ScreenPtr screen)
 	adaptor->pScreen = screen;
 	adaptor->name = (char *)"Intel(R) Video Overlay";
 	adaptor->nEncodings = 1;
-	adaptor->pEncodings = xnfalloc(sizeof(XvEncodingRec));
+	adaptor->pEncodings = XNFalloc(sizeof(XvEncodingRec));
 	adaptor->pEncodings[0].id = 0;
 	adaptor->pEncodings[0].pScreen = screen;
 	adaptor->pEncodings[0].name = (char *)"XV_IMAGE";
diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c
index db3865b9..2d012b95 100644
--- a/src/sna/sna_video_sprite.c
+++ b/src/sna/sna_video_sprite.c
@@ -854,7 +854,7 @@  void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen)
 	adaptor->pScreen = screen;
 	adaptor->name = (char *)"Intel(R) Video Sprite";
 	adaptor->nEncodings = 1;
-	adaptor->pEncodings = xnfalloc(sizeof(XvEncodingRec));
+	adaptor->pEncodings = XNFalloc(sizeof(XvEncodingRec));
 	adaptor->pEncodings[0].id = 0;
 	adaptor->pEncodings[0].pScreen = screen;
 	adaptor->pEncodings[0].name = (char *)"XV_IMAGE";
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 6e30461d..0b3330f2 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -414,7 +414,7 @@  void sna_video_textured_setup(struct sna *sna, ScreenPtr screen)
 	adaptor->pScreen = screen;
 	adaptor->name = (char *)"Intel(R) Textured Video";
 	adaptor->nEncodings = 1;
-	adaptor->pEncodings = xnfalloc(sizeof(XvEncodingRec));
+	adaptor->pEncodings = XNFalloc(sizeof(XvEncodingRec));
 	adaptor->pEncodings[0].id = 0;
 	adaptor->pEncodings[0].pScreen = screen;
 	adaptor->pEncodings[0].name = (char *)"XV_IMAGE";
diff --git a/src/uxa/intel_uxa_video.c b/src/uxa/intel_uxa_video.c
index 8287be4b..8e0eb4a2 100644
--- a/src/uxa/intel_uxa_video.c
+++ b/src/uxa/intel_uxa_video.c
@@ -339,7 +339,7 @@  XF86VideoAdaptorPtr intel_uxa_video_setup_image_textured(ScreenPtr screen)
 	adapt->flags = 0;
 	adapt->name = "Intel(R) Textured Video";
 	adapt->nEncodings = 1;
-	adapt->pEncodings = xnfalloc(sizeof(intel_xv_dummy_encoding));
+	adapt->pEncodings = XNFalloc(sizeof(intel_xv_dummy_encoding));
 	memcpy(adapt->pEncodings, intel_xv_dummy_encoding, sizeof(intel_xv_dummy_encoding));
 	adapt->nFormats = NUM_FORMATS;
 	adapt->pFormats = intel_xv_formats;
diff --git a/src/uxa/intel_video_overlay.c b/src/uxa/intel_video_overlay.c
index 8e0eb7af..35f615c2 100644
--- a/src/uxa/intel_video_overlay.c
+++ b/src/uxa/intel_video_overlay.c
@@ -465,7 +465,7 @@  XF86VideoAdaptorPtr intel_video_overlay_setup_image(ScreenPtr screen)
 	adapt->flags = VIDEO_OVERLAID_IMAGES /*| VIDEO_CLIP_TO_VIEWPORT */ ;
 	adapt->name = "Intel(R) Video Overlay";
 	adapt->nEncodings = 1;
-	adapt->pEncodings = xnfalloc(sizeof(intel_xv_dummy_encoding));
+	adapt->pEncodings = XNFalloc(sizeof(intel_xv_dummy_encoding));
 	memcpy(adapt->pEncodings, intel_xv_dummy_encoding, sizeof(intel_xv_dummy_encoding));
 	if (IS_845G(intel) || IS_I830(intel)) {
 		adapt->pEncodings->width = IMAGE_MAX_WIDTH_LEGACY;
@@ -483,7 +483,7 @@  XF86VideoAdaptorPtr intel_video_overlay_setup_image(ScreenPtr screen)
 	if (INTEL_INFO(intel)->gen >= 030)
 		adapt->nAttributes += GAMMA_ATTRIBUTES;	/* has gamma */
 	adapt->pAttributes =
-	    xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
+	    XNFalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
 	/* Now copy the attributes */
 	att = adapt->pAttributes;
 	memcpy((char *)att, (char *)intel_xv_attributes,