[Pkg-pciutils-commits] CVS pciutils/lib

[CVS User willy]

Update of /cvsroot/pkg-pciutils/pciutils/lib
In directory haydn:/tmp/cvs-serv17997/lib

Modified Files:
	names.c 
Log Message:

Remove compile warnings; patch already accepted upstream



--- /cvsroot/pkg-pciutils/pciutils/lib/names.c	2006/03/13 15:20:06	1.4
+++ /cvsroot/pkg-pciutils/pciutils/lib/names.c	2006/03/21 19:44:22	1.5
@@ -17,8 +17,8 @@
 struct id_entry {
   struct id_entry *next;
   u32 id12, id34;
-  byte cat;
-  byte name[1];
+  byte cat;	/* Actually an enum id_entry_type */
+  char name[1];
 };
 
 enum id_entry_type {
@@ -81,7 +81,7 @@
   return h % HASH_SIZE;
 }
 
-static struct id_entry *id_lookup(struct pci_access *a, int cat, int id1, int id2, int id3, int id4)
+static struct id_entry *id_lookup(struct pci_access *a, enum id_entry_type cat, int id1, int id2, int id3, int id4)
 {
   struct id_entry *n;
   u32 id12 = id_pair(id1, id2);
@@ -93,7 +93,7 @@
   return n;
 }
 
-static int id_insert(struct pci_access *a, int cat, int id1, int id2, int id3, int id4, byte *text)
+static int id_insert(struct pci_access *a, enum id_entry_type cat, int id1, int id2, int id3, int id4, char *text)
 {
   u32 id12 = id_pair(id1, id2);
   u32 id34 = id_pair(id3, id4);
@@ -115,7 +115,7 @@
   return 0;
 }
 
-static int id_hex(byte *p, int cnt)
+static int id_hex(char *p, int cnt)
 {
   int x = 0;
   while (cnt--)
@@ -141,8 +141,8 @@
 
 static const char *id_parse_list(struct pci_access *a, FILE *f, int *lino)
 {
-  byte line[MAX_LINE];
-  byte *p;
+  char line[MAX_LINE];
+  char *p;
   int id1=0, id2=0, id3=0, id4=0;
   int cat = -1;
   int nest;