[PATCH 03/16] xfree86/int10/helper_mem: Fix log message.

Jamey Sharp jamey at minilop.net
Tue May 25 16:53:14 PDT 2010


Three years ago in commit f62beb6f3609e8b6e61325ac89017590811bbd07 ajax
deleted the code that could have set this format string to anything
else, so just use the format string literal. This makes GCC happy since
it can check the argument types, which, by the way, weren't correct
since this format string doesn't need any arguments.

Signed-off-by: Jamey Sharp <jamey at minilop.net>
---
 hw/xfree86/int10/helper_mem.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c
index 3f206c2..496c9a5 100644
--- a/hw/xfree86/int10/helper_mem.c
+++ b/hw/xfree86/int10/helper_mem.c
@@ -296,15 +296,12 @@ xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base)
     unsigned i;
     int cs = ~0;
     int segments[4];
-    const char * format;
 
     segments[0] = MEM_RW(pInt, (0x10 << 2) + 2);
     segments[1] = MEM_RW(pInt, (0x42 << 2) + 2);
     segments[2] = V_BIOS >> 4;
     segments[3] = ~0;
 
-    format = "No V_BIOS found\n";
-
     for (i = 0; segments[i] != ~0; i++) {
 	unsigned char * vbiosMem;
 
@@ -318,7 +315,7 @@ xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base)
     }
 
     if (segments[i] == ~0) {
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR, format, (unsigned long)cs << 4);
+	xf86DrvMsg(pInt->scrnIndex, X_ERROR, "No V_BIOS found\n");
 	return FALSE;
     }
 
-- 
1.7.0



More information about the xorg-devel mailing list