[patch] 2.1.11-gcc4.patch

2.1.11-gcc4.patch (text/plain), 6.51 KB, created by Aaron Walker (RETIRED) on 2005-05-13 04:58:01 UTC

diff --exclude='*~' --exclude='.*' -I '$Id:' -urN pciutils-2.1.11.orig/lib/names.c pciutils-2.1.11/lib/names.c
--- pciutils-2.1.11.orig/lib/names.c	2005-05-13 04:43:48.000000000 -0400
+++ pciutils-2.1.11/lib/names.c	2005-05-13 05:01:17.000000000 -0400
@@ -87,7 +87,7 @@
 static void
 parse_name_list(struct pci_access *a)
 {
-  byte *p = a->nl_list;
+  byte *p = (byte *)a->nl_list;
   byte *q, *r;
   int lino = 0;
   unsigned int id1=0, id2=0, id3=0, id4=0;
@@ -113,17 +113,17 @@
 	{
 	  if (q[0] == 'C' && q[1] == ' ')
 	    {
-	      if (strlen(q+2) < 3 ||
+	      if (strlen((char *)q+2) < 3 ||
 		  q[4] != ' ' ||
-		  sscanf(q+2, "%x", &id1) != 1)
+		  sscanf((char *)q+2, "%x", &id1) != 1)
 		goto parserr;
 	      cat = NL_CLASS;
 	    }
 	  else
 	    {
-	      if (strlen(q) < 5 ||
+	      if (strlen((char *)q) < 5 ||
 		  q[4] != ' ' ||
-		  sscanf(q, "%x", &id1) != 1)
+		  sscanf((char *)q, "%x", &id1) != 1)
 		goto parserr;
 	      cat = NL_VENDOR;
 	    }
@@ -136,7 +136,7 @@
 	  case NL_VENDOR:
 	  case NL_DEVICE:
 	  case NL_SUBSYSTEM:
-	    if (sscanf(q, "%x", &id2) != 1 || q[4] != ' ')
+	    if (sscanf((char *)q, "%x", &id2) != 1 || q[4] != ' ')
 	      goto parserr;
 	    q += 5;
 	    cat = NL_DEVICE;
@@ -145,7 +145,7 @@
 	  case NL_CLASS:
 	  case NL_SUBCLASS:
 	  case NL_PROGIF:
-	    if (sscanf(q, "%x", &id2) != 1 || q[2] != ' ')
+	    if (sscanf((char *)q, "%x", &id2) != 1 || q[2] != ' ')
 	      goto parserr;
 	    q += 3;
 	    cat = NL_SUBCLASS;
@@ -159,7 +159,7 @@
 	  {
 	  case NL_DEVICE:
 	  case NL_SUBSYSTEM:
-	    if (sscanf(q, "%x%x", &id3, &id4) != 2 || q[9] != ' ')
+	    if (sscanf((char *)q, "%x%x", &id3, &id4) != 2 || q[9] != ' ')
 	      goto parserr;
 	    q += 10;
 	    cat = NL_SUBSYSTEM;
@@ -167,7 +167,7 @@
 	  case NL_CLASS:
 	  case NL_SUBCLASS:
 	  case NL_PROGIF:
-	    if (sscanf(q, "%x", &id3) != 1 || q[2] != ' ')
+	    if (sscanf((char *)q, "%x", &id3) != 1 || q[2] != ' ')
 	      goto parserr;
 	    q += 3;
 	    cat = NL_PROGIF;
@@ -245,13 +245,13 @@
     {
     case PCI_LOOKUP_VENDOR:
       if (n = nl_lookup(a, num, NL_VENDOR, arg1, 0, 0, 0))
-	return n->name;
+	return (char *)n->name;
       else
 	res = snprintf(buf, size, "%04x", arg1);
       break;
     case PCI_LOOKUP_DEVICE:
       if (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2, 0, 0))
-	return n->name;
+	return (char *)n->name;
       else
 	res = snprintf(buf, size, "%04x", arg2);
       break;
@@ -273,15 +273,15 @@
       break;
     case PCI_LOOKUP_VENDOR | PCI_LOOKUP_SUBSYSTEM:
       if (n = nl_lookup(a, num, NL_VENDOR, arg3, 0, 0, 0))
-	return n->name;
+	return (char *)n->name;
       else
 	res = snprintf(buf, size, "%04x", arg2);
       break;
     case PCI_LOOKUP_DEVICE | PCI_LOOKUP_SUBSYSTEM:
       if (n = nl_lookup(a, num, NL_SUBSYSTEM, arg1, arg2, arg3, arg4))
-	return n->name;
+	return (char *)n->name;
       else if (arg1 == arg3 && arg2 == arg4 && (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2, 0, 0)))
-	return n->name;
+	return (char *)n->name;
       else
 	res = snprintf(buf, size, "%04x", arg4);
       break;
@@ -306,7 +306,7 @@
       break;
     case PCI_LOOKUP_CLASS:
       if (n = nl_lookup(a, num, NL_SUBCLASS, arg1 >> 8, arg1 & 0xff, 0, 0))
-	return n->name;
+	return (char *)n->name;
       else if (n = nl_lookup(a, num, NL_CLASS, arg1, 0, 0, 0))
 	res = snprintf(buf, size, "%s [%04x]", n->name, arg1);
       else
@@ -314,7 +314,7 @@
       break;
     case PCI_LOOKUP_PROGIF:
       if (n = nl_lookup(a, num, NL_PROGIF, arg1 >> 8, arg1 & 0xff, arg2, 0))
-	return n->name;
+	return (char *)n->name;
       if (arg1 == 0x0101)
 	{
 	  /* IDE controllers have complex prog-if semantics */
diff --exclude='*~' --exclude='.*' -I '$Id:' -urN pciutils-2.1.11.orig/lspci.c pciutils-2.1.11/lspci.c
--- pciutils-2.1.11.orig/lspci.c	2005-05-13 04:43:48.000000000 -0400
+++ pciutils-2.1.11/lspci.c	2005-05-13 05:01:24.000000000 -0400
@@ -243,10 +243,10 @@
 	 p->bus,
 	 p->dev,
 	 p->func,
-	 pci_lookup_name(pacc, classbuf, sizeof(classbuf),
+	 pci_lookup_name(pacc, (char *)classbuf, sizeof(classbuf),
 			 PCI_LOOKUP_CLASS,
 			 get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0),
-	 pci_lookup_name(pacc, devbuf, sizeof(devbuf),
+	 pci_lookup_name(pacc, (char *)devbuf, sizeof(devbuf),
 			 PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
 			 p->vendor_id, p->device_id, 0, 0));
   if (c = get_conf_byte(d, PCI_REVISION_ID))
@@ -255,7 +255,7 @@
     {
       char *x;
       c = get_conf_byte(d, PCI_CLASS_PROG);
-      x = pci_lookup_name(pacc, devbuf, sizeof(devbuf),
+      x = pci_lookup_name(pacc, (char *)devbuf, sizeof(devbuf),
 			  PCI_LOOKUP_PROGIF,
 			  get_conf_word(d, PCI_CLASS_DEVICE), c, 0, 0);
       if (c || x)
@@ -1218,7 +1218,7 @@
 {
   *p++ = '\n';
   *p = 0;
-  fputs(line, stdout);
+  fputs((char *)line, stdout);
   for(p=line; *p; p++)
     if (*p == '+' || *p == '|')
       *p = '|';
@@ -1235,20 +1235,20 @@
   struct bridge *b;
   char namebuf[256];
 
-  p += sprintf(p, "%02x.%x", q->dev, q->func);
+  p += sprintf((char *)p, "%02x.%x", q->dev, q->func);
   for(b=&host_bridge; b; b=b->chain)
     if (b->br_dev == d)
       {
 	if (b->secondary == b->subordinate)
-	  p += sprintf(p, "-[%02x]-", b->secondary);
+	  p += sprintf((char *)p, "-[%02x]-", b->secondary);
 	else
-	  p += sprintf(p, "-[%02x-%02x]-", b->secondary, b->subordinate);
+	  p += sprintf((char *)p, "-[%02x-%02x]-", b->secondary, b->subordinate);
         show_tree_bridge(b, line, p);
         return;
       }
   if (verbose)
-    p += sprintf(p, "  %s",
-		 pci_lookup_name(pacc, namebuf, sizeof(namebuf),
+    p += sprintf((char *)p, "  %s",
+		 pci_lookup_name(pacc, (char *)namebuf, sizeof(namebuf),
 				 PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
 				 q->vendor_id, q->device_id, 0, 0));
   print_it(line, p);
@@ -1288,7 +1288,7 @@
   if (!b->first_bus->sibling)
     {
       if (b == &host_bridge)
-        p += sprintf(p, "[%02x]-", b->first_bus->number);
+        p += sprintf((char *)p, "[%02x]-", b->first_bus->number);
       show_tree_bus(b->first_bus, line, p);
     }
   else
@@ -1298,11 +1298,11 @@
 
       while (u->sibling)
         {
-          k = p + sprintf(p, "+-[%02x]-", u->number);
+          k = p + sprintf((char *)p, "+-[%02x]-", u->number);
           show_tree_bus(u, line, k);
           u = u->sibling;
         }
-      k = p + sprintf(p, "\\-[%02x]-", u->number);
+      k = p + sprintf((char *)p, "\\-[%02x]-", u->number);
       show_tree_bus(u, line, k);
     }
 }
@@ -1313,7 +1313,7 @@
   char line[256];
 
   grow_tree();
-  show_tree_bridge(&host_bridge, line, line);
+  show_tree_bridge(&host_bridge, (byte *)line, (byte *)line);
 }
 
 /* Bus mapping mode */