From 34df659687ad3936ab03d19ce8fdb21f385c2e8a Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Tue, 25 May 2010 11:51:32 -0700 Subject: [PATCH] xfree86/int10/helper_mem: Fix log message. 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 Reviewed-by: Alex Deucher Reviewed-by: Tiago Vignatti --- hw/xfree86/int10/helper_mem.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index 3f206c2e3..496c9a529 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; }