Attachment 19848 Details for Bug 18204 – patch to avoid some gcc warnings, reporting correct resource ranges

[patch] patch to avoid some gcc warnings, reporting correct resource ranges

patch-10-format (text/plain), 13.94 KB, created by Peter Breitenlohner on 2008-10-24 04:49:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Breitenlohner

Created: 2008-10-24 04:49:57 UTC

Size: 13.94 KB

patch

obsolete

>	Avoid compiler warnings
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1109: warning: long unsigned int format, memType arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1109: warning: long unsigned int format, memType arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1122: warning: long unsigned int format, memType arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1122: warning: long unsigned int format, memType arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1187: warning: long unsigned int format, memType arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1187: warning: long unsigned int format, memType arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1195: warning: long unsigned int format, memType arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1195: warning: long unsigned int format, memType arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1271: warning: long unsigned int format, memType arg (arg 6)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1271: warning: long unsigned int format, memType arg (arg 7)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1271: warning: long unsigned int format, memType arg (arg 8)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1277: warning: long unsigned int format, memType arg (arg 6)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:1277: warning: long unsigned int format, memType arg (arg 7)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:2001: warning: long unsigned int format, memType arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:2001: warning: long unsigned int format, memType arg (arg 5)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c:2213: warning: long unsigned int format, memType arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86pciBus.c:444: warning: long unsigned int format, different type arg (arg 2)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86pciBus.c:444: warning: long int format, different type arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86pciBus.c:457: warning: long unsigned int format, different type arg (arg 2)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86pciBus.c:457: warning: long int format, different type arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/common/xf86pciBus.c:462: warning: long int format, different type arg (arg 2)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:221: warning: int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:221: warning: unsigned int format, CARD32 arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:237: warning: int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:237: warning: unsigned int format, CARD32 arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:253: warning: int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:253: warning: unsigned int format, CARD32 arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:269: warning: int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:269: warning: unsigned int format, CARD32 arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:285: warning: int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:285: warning: unsigned int format, CARD32 arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:301: warning: int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:301: warning: unsigned int format, CARD32 arg (arg 4)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:410: warning: unsigned int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:420: warning: unsigned int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:499: warning: passing arg 2 of `pci_device_cfg_read_u32' from incompatible pointer type
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:501: warning: unsigned int format, CARD32 arg (arg 2)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:501: warning: unsigned int format, long unsigned int arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:516: warning: unsigned int format, CARD32 arg (arg 2)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:516: warning: unsigned int format, CARD32 arg (arg 3)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:540: warning: unsigned int format, long unsigned int arg (arg 2)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:561: warning: unsigned int format, long unsigned int arg (arg 2)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:585: warning: unsigned int format, long unsigned int arg (arg 2)
>../../../../xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c:606: warning: unsigned int format, long unsigned int arg (arg 2)
>
>diff -ur xorg-server-1.5.2.orig/hw/xfree86/common/xf86Bus.c xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c
>--- xorg-server-1.5.2.orig/hw/xfree86/common/xf86Bus.c	2008-10-10 20:12:48.000000000 +0200
>+++ xorg-server-1.5.2/hw/xfree86/common/xf86Bus.c	2008-10-20 23:25:37.000000000 +0200
>@@ -1106,7 +1106,7 @@
> 	case ResBlock:
> 	    if (rgp->rEnd < rgp->rBegin) {
> 		xf86Msg(X_ERROR,"end of block range 0x%lx < begin 0x%lx\n",
>-			rgp->rEnd,rgp->rBegin);
>+			(unsigned long int)rgp->rEnd, (unsigned long int)rgp->rBegin);
> 		return 0;
> 	    }
> 	    if ((ret = checkConflictBlock(rgp, pRes))) {
>@@ -1119,7 +1119,7 @@
> 	    if ((rgp->rBase & rgp->rMask) != rgp->rBase) {
> 		xf86Msg(X_ERROR,"sparse io range (base: 0x%lx  mask: 0x%lx)"
> 			"doesn't satisfy (base & mask = mask)\n",
>-			rgp->rBase, rgp->rMask);
>+			(unsigned long int)rgp->rBase, (unsigned long int)rgp->rMask);
> 		return 0;
> 	    }
> 	    if ((ret = checkConflictSparse(rgp, pRes))) {
>@@ -1184,7 +1184,7 @@
>     case ResBlock:
> 	if (range->rEnd < range->rBegin) {
> 		xf86Msg(X_ERROR,"end of block range 0x%lx < begin 0x%lx\n",
>-			range->rEnd,range->rBegin);
>+			(unsigned long int)range->rEnd, (unsigned long int)range->rBegin);
> 		return rlist;
> 	}
> 	break;
>@@ -1192,7 +1192,7 @@
> 	if ((range->rBase & range->rMask) != range->rBase) {
> 	    xf86Msg(X_ERROR,"sparse io range (base: 0x%lx  mask: 0x%lx)"
> 		    "doesn't satisfy (base & mask = mask)\n",
>-		    range->rBase, range->rMask);
>+		    (unsigned long int)range->rBase, (unsigned long int)range->rMask);
> 	    return rlist;
> 	}
> 	break;
>@@ -1267,14 +1267,16 @@
> 				   "\t[%d] %d\t%ld\t0x%08lx - 0x%08lx (0x%lx)",
> 				   i, list->entityIndex,
> 				   (list->res_type & ResDomain) >> 24,
>-				   list->block_begin, list->block_end,
>-				   list->block_end - list->block_begin + 1);
>+				   (unsigned long int)list->block_begin,
>+				   (unsigned long int)list->block_end,
>+				   (unsigned long int)(list->block_end - list->block_begin + 1));
> 		    break;
> 		case ResSparse:
> 		    xf86ErrorFVerb(verb, "\t[%d] %d\t%ld\t0x%08lx - 0x%08lx ",
> 				   i, list->entityIndex,
> 				   (list->res_type & ResDomain) >> 24,
>-				   list->sparse_base,list->sparse_mask);
>+				   (unsigned long int)list->sparse_base,
>+				   (unsigned long int)list->sparse_mask);
> 		    break;
> 		default:
> 		    list = list->next;
>@@ -1997,8 +1999,8 @@
> 	       "specify your computer hardware as closely as possible.\n",
> 	       ResIsBlock(list)?"Block":"Sparse",
> 	       ResIsMem(list)?"Mem":"Io",
>-	       ResIsBlock(list)?list->rBegin:list->rBase,
>-	       ResIsBlock(list)?list->rEnd:list->rMask,BUILDERADDR);
>+	       (unsigned long int)(ResIsBlock(list)?list->rBegin:list->rBase),
>+	       (unsigned long int)(ResIsBlock(list)?list->rEnd:list->rMask),BUILDERADDR);
> }
> 
> /*
>@@ -2210,7 +2212,7 @@
>  		    AccReducers->next = tmp;
> #endif
> 		} else {
>-		    xf86MsgVerb(X_INFO, 3, "Found conflict at: 0x%lx\n",val);
>+		    xf86MsgVerb(X_INFO, 3, "Found conflict at: 0x%lx\n", (unsigned long int)val);
>  		    resp->res_type &= ~ResEstimated;
> 		    tmp = xf86Entities[i]->resources;
> 		    xf86Entities[i]->resources = resp;
>diff -ur xorg-server-1.5.2.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.5.2/hw/xfree86/common/xf86pciBus.c
>--- xorg-server-1.5.2.orig/hw/xfree86/common/xf86pciBus.c	2008-09-15 16:39:33.000000000 +0200
>+++ xorg-server-1.5.2/hw/xfree86/common/xf86pciBus.c	2008-10-20 23:30:05.000000000 +0200
>@@ -441,7 +441,7 @@
> 		    memdone = TRUE;
> 		} else
> 		    xf86ErrorF(", ");
>-		xf86ErrorF("0x%08lx/%ld", r->base_addr, r->size);
>+		xf86ErrorF("0x%08lx/%ld", (unsigned long int)r->base_addr, (long int)r->size);
> 	    }
> 	}
> 
>@@ -454,12 +454,12 @@
> 		    iodone = TRUE;
> 		} else
> 		    xf86ErrorF(", ");
>-		xf86ErrorF("0x%08lx/%ld", r->base_addr, r->size);
>+		xf86ErrorF("0x%08lx/%ld", (unsigned long int)r->base_addr, (long int)r->size);
> 	    }
> 	}
> 
> 	if ( info->rom_size ) {
>-	    xf86ErrorF(", BIOS @ 0x\?\?\?\?\?\?\?\?/%ld", info->rom_size);
>+	    xf86ErrorF(", BIOS @ 0x\?\?\?\?\?\?\?\?/%ld", (long int)info->rom_size);
> 	}
> 
> 	xf86ErrorF("\n");
>diff -ur xorg-server-1.5.2.orig/hw/xfree86/int10/helper_exec.c xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c
>--- xorg-server-1.5.2.orig/hw/xfree86/int10/helper_exec.c	2008-10-08 17:16:55.000000000 +0200
>+++ xorg-server-1.5.2/hw/xfree86/int10/helper_exec.c	2008-10-20 23:47:24.000000000 +0200
>@@ -218,7 +218,7 @@
>     CARD32 dst = base;
>     if (PRINT_PORT && DEBUG_IO_TRACE())
> 	ErrorF(" rep_insb(%#x) %d bytes at %8.8x %s\n",
>-		port, count, base, d_f ? "up" : "down");
>+		port, (int)count, (unsigned int)base, d_f ? "up" : "down");
>     while (count--) {
> 	MEM_WB(pInt, dst, x_inb(port));
> 	dst += inc;
>@@ -234,7 +234,7 @@
>     CARD32 dst = base;
>     if (PRINT_PORT && DEBUG_IO_TRACE())
> 	ErrorF(" rep_insw(%#x) %d bytes at %8.8x %s\n",
>-	     port, count, base, d_f ? "up" : "down");
>+	     port, (int)count, (unsigned int)base, d_f ? "up" : "down");
>     while (count--) {
> 	MEM_WW(pInt, dst, x_inw(port));
> 	dst += inc;
>@@ -250,7 +250,7 @@
>     CARD32 dst = base;
>     if (PRINT_PORT && DEBUG_IO_TRACE())
> 	ErrorF(" rep_insl(%#x) %d bytes at %8.8x %s\n",
>-	     port, count, base, d_f ? "up" : "down");
>+	     port, (int)count, (unsigned int)base, d_f ? "up" : "down");
>     while (count--) {
> 	MEM_WL(pInt, dst, x_inl(port));
> 	dst += inc;
>@@ -266,7 +266,7 @@
>     CARD32 dst = base;
>     if (PRINT_PORT && DEBUG_IO_TRACE())
> 	ErrorF(" rep_outb(%#x) %d bytes at %8.8x %s\n",
>-	     port, count, base, d_f ? "up" : "down");
>+	     port, (int)count, (unsigned int)base, d_f ? "up" : "down");
>     while (count--) {
> 	x_outb(port, MEM_RB(pInt, dst));
> 	dst += inc;
>@@ -282,7 +282,7 @@
>     CARD32 dst = base;
>     if (PRINT_PORT && DEBUG_IO_TRACE())
> 	ErrorF(" rep_outw(%#x) %d bytes at %8.8x %s\n",
>-	     port, count, base, d_f ? "up" : "down");
>+	     port, (int)count, (unsigned int)base, d_f ? "up" : "down");
>     while (count--) {
> 	x_outw(port, MEM_RW(pInt, dst));
> 	dst += inc;
>@@ -298,7 +298,7 @@
>     CARD32 dst = base;
>     if (PRINT_PORT && DEBUG_IO_TRACE())
> 	ErrorF(" rep_outl(%#x) %d bytes at %8.8x %s\n",
>-	     port, count, base, d_f ? "up" : "down");
>+	     port, (int)count, (unsigned int)base, d_f ? "up" : "down");
>     while (count--) {
> 	x_outl(port, MEM_RL(pInt, dst));
> 	dst += inc;
>@@ -407,7 +407,7 @@
>     if (!pciCfg1in(port, &val)) {
> 	val = inl(Int10Current->ioBase + port);
> 	if (PRINT_PORT && DEBUG_IO_TRACE())
>-	    ErrorF(" inl(%#x) = %8.8x\n", port, val);
>+	    ErrorF(" inl(%#x) = %8.8x\n", port, (unsigned int)val);
>     }
>     return val;
> }
>@@ -417,7 +417,7 @@
> {
>     if (!pciCfg1out(port, val)) {
> 	if (PRINT_PORT && DEBUG_IO_TRACE())
>-	    ErrorF(" outl(%#x, %8.8x)\n", port, val);
>+	    ErrorF(" outl(%#x, %8.8x)\n", port, (unsigned int)val);
> 	outl(Int10Current->ioBase + port, val);
>     }
> }
>@@ -496,9 +496,9 @@
>     }
>     if (addr == 0xCFC) {
> 	pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr),
>-			val, PCI_OFFSET(PciCfg1Addr));
>+			(uint32_t*)val, PCI_OFFSET(PciCfg1Addr));
> 	if (PRINT_PORT && DEBUG_IO_TRACE())
>-	    ErrorF(" cfg_inl(%#x) = %8.8x\n", PciCfg1Addr, *val);
>+	    ErrorF(" cfg_inl(%#x) = %8.8x\n", (unsigned int)PciCfg1Addr, (unsigned int)*val);
> 	return 1;
>     }
>     return 0;
>@@ -513,7 +513,7 @@
>     }
>     if (addr == 0xCFC) {
> 	if (PRINT_PORT && DEBUG_IO_TRACE())
>-	    ErrorF(" cfg_outl(%#x, %8.8x)\n", PciCfg1Addr, val);
>+	    ErrorF(" cfg_outl(%#x, %8.8x)\n", (unsigned int)PciCfg1Addr, (unsigned int)val);
> 	pci_device_cfg_write_u32(pci_device_for_cfg_address(PciCfg1Addr),
> 			val, PCI_OFFSET(PciCfg1Addr));
> 	return 1;
>@@ -537,7 +537,7 @@
> 	pci_device_cfg_read_u16(pci_device_for_cfg_address(PciCfg1Addr),
> 			val, PCI_OFFSET(PciCfg1Addr) + offset);
> 	if (PRINT_PORT && DEBUG_IO_TRACE())
>-	    ErrorF(" cfg_inw(%#x) = %4.4x\n", PciCfg1Addr + offset, *val);
>+	    ErrorF(" cfg_inw(%#x) = %4.4x\n", (unsigned int)PciCfg1Addr + offset, *val);
> 	return 1;
>     }
>     return 0;
>@@ -558,7 +558,7 @@
> 	const unsigned offset = addr - 0xCFC;
> 
> 	if (PRINT_PORT && DEBUG_IO_TRACE())
>-	    ErrorF(" cfg_outw(%#x, %4.4x)\n", PciCfg1Addr + offset, val);
>+	    ErrorF(" cfg_outw(%#x, %4.4x)\n", (unsigned int)PciCfg1Addr + offset, val);
> 	pci_device_cfg_write_u16(pci_device_for_cfg_address(PciCfg1Addr),
> 			val, PCI_OFFSET(PciCfg1Addr) + offset);
> 	return 1;
>@@ -582,7 +582,7 @@
> 	pci_device_cfg_read_u8(pci_device_for_cfg_address(PciCfg1Addr),
> 			val, PCI_OFFSET(PciCfg1Addr) + offset);
> 	if (PRINT_PORT && DEBUG_IO_TRACE())
>-	    ErrorF(" cfg_inb(%#x) = %2.2x\n", PciCfg1Addr + offset, *val);
>+	    ErrorF(" cfg_inb(%#x) = %2.2x\n", (unsigned int)PciCfg1Addr + offset, *val);
> 	return 1;
>     }
>     return 0;
>@@ -603,7 +603,7 @@
> 	const unsigned offset = addr - 0xCFC;
> 
> 	if (PRINT_PORT && DEBUG_IO_TRACE())
>-	    ErrorF(" cfg_outb(%#x, %2.2x)\n", PciCfg1Addr + offset, val);
>+	    ErrorF(" cfg_outb(%#x, %2.2x)\n", (unsigned int)PciCfg1Addr + offset, val);
> 	pci_device_cfg_write_u8(pci_device_for_cfg_address(PciCfg1Addr),
> 			val, PCI_OFFSET(PciCfg1Addr) + offset);
> 	return 1;

Actions: View | Splinter Review

Attachments on bug 18204: 19848

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.