[PATCH] kms: Fix warning XNFprintf is deprecated (v2)

Sedat Dilek sedat.dilek at googlemail.com
Sat Feb 26 12:04:22 PST 2011


The first take of my patch missed the breakage against pre-1.10
xservers and now I know XNFasprintf() is not a 1:1 replacement
for XNFprintf().
The idea for the fix seemed to be so obvious, but as usual "really"
test the patch you are sending to any ML.
I am awfully sorry for the overhasty bad hack.
Thanks to Alan and Alex for the help to fix it correctly, now.

Tested-By: Sedat Dilek <sedat.dilek at gmail.com>
CC: Alan Coopersmith <alan.coopersmith at oracle.com>
CC: Alex Deucher <alexdeucher at gmail.com>
CC: Michel Dänzer <michel at daenzer.net>
Signed-off-by: Sedat Dilek <sedat.dilek at gmail.com>
---
 src/radeon_kms.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 158dc57..adf9b70 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -409,8 +409,13 @@ static Bool radeon_open_drm_master(ScrnInfoPtr pScrn)
 	goto out;
     }
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
+    XNFasprintf(&busid, "pci:%04x:%02x:%02x.%d",
+                dev->domain, dev->bus, dev->dev, dev->func);
+#else
     busid = XNFprintf("pci:%04x:%02x:%02x.%d",
 		      dev->domain, dev->bus, dev->dev, dev->func);
+#endif
 
     info->dri2.drm_fd = drmOpen("radeon", busid);
     if (info->dri2.drm_fd == -1) {
-- 
1.7.4.1



More information about the xorg-driver-ati mailing list