ensure the header file are C++ compliant (do not use "class" for struct field name)

8 files changed, 22 insertions, 20 deletions

diff --git a/generate_pciclass.pl b/generate_pciclass.pl
index e6ed87a..77d0c40 100644
--- a/generate_pciclass.pl
+++ b/generate_pciclass.pl
@@ -15,10 +15,10 @@ print '
 
 int nb_pciclasses = sizeof(pciclasses) / sizeof(*pciclasses);
 
-extern const char *pci_class2text(unsigned long class) {
+extern const char *pci_class2text(unsigned long class_) {
   int i;
   for (i = 0; i < nb_pciclasses; i++)
-    if (pciclasses[i].id == class) return pciclasses[i].name;
+    if (pciclasses[i].id == class_) return pciclasses[i].name;
 
   return pci_class2text(0);
 }
diff --git a/generate_usbclass.pl b/generate_usbclass.pl
index ae85164..7e2dad3 100755
--- a/generate_usbclass.pl
+++ b/generate_usbclass.pl
@@ -34,10 +34,10 @@ print '
 
 int nb_usbclasses = sizeof(usbclasses) / sizeof(*usbclasses);
 
-extern const char *usb_class2text(unsigned long class) {
+extern const char *usb_class2text(unsigned long class_) {
   int i;
   for (i = 0; i < nb_usbclasses; i++)
-    if (usbclasses[i].id == class) return usbclasses[i].name;
+    if (usbclasses[i].id == class_) return usbclasses[i].name;
 
   return "";
 }
diff --git a/ldetect.spec b/ldetect.spec
index 7528dab..ce9e859 100644
--- a/ldetect.spec
+++ b/ldetect.spec
@@ -1,6 +1,5 @@
-# !! DON'T MODIFY HERE, MODIFY IN THE CVS !!
 %define name ldetect
-%define version 0.2.5
+%define version 0.4.0
 %define release 1mdk
 
 Name: %{name}
@@ -53,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*
 
 %changelog
+* Mon Jun 10 2002 Pixel <pixel@mandrakesoft.com> 0.4.0-1mdk
+- ensure the header file are C++ compliant (do not use "class" for struct field name)
+
 * Fri Dec 28 2001 Pixel <pixel@mandrakesoft.com> 0.2.5-1mdk
 - in probe_type=1, recognize usb controllers (is either usb-uhci or usb-ohci)
 
diff --git a/libldetect.h b/libldetect.h
index 4733d9e..7020332 100644
--- a/libldetect.h
+++ b/libldetect.h
@@ -7,7 +7,7 @@ struct pciusb_entry {
 
   unsigned short subvendor; /* 0xffff if not probe_type'd or no subid */
   unsigned short subdevice; /* 0xffff if not probe_type'd or no subid */
-  unsigned long class; /* 0 if not probe_type'd */
+  unsigned long class_; /* 0 if not probe_type'd */
 
   unsigned short pci_bus; /* pci bus id 8 bits wide */
   unsigned short pci_device; /* pci device id 5 bits wide */
@@ -28,10 +28,10 @@ extern void pciusb_free(struct pciusb_entries entries);
 /* pci ************************************************************************/
 /******************************************************************************/
 extern struct pciusb_entries pci_probe(int probe_type); /* probe_type is boolean */
-extern const char *pci_class2text(unsigned long class);
+extern const char *pci_class2text(unsigned long class_);
 
 /******************************************************************************/
 /* usb ************************************************************************/
 /******************************************************************************/
 extern struct pciusb_entries usb_probe(void);
-extern const char *usb_class2text(unsigned long class);
+extern const char *usb_class2text(unsigned long class_);
diff --git a/lspcidrake.c b/lspcidrake.c
index b17d184..ad923ec 100644
--- a/lspcidrake.c
+++ b/lspcidrake.c
@@ -33,9 +33,9 @@ void pci_printit(struct pciusb_entries entries) {
   for (i = 0; i < entries.nb; i++) {
     struct pciusb_entry e = entries.entries[i];
     print_name(e);
-    if (e.class) {
-      const char *class = pci_class2text(e.class);
-      if (strcmp(class, "NOT_DEFINED") != 0) printf(" [%s]", class);
+    if (e.class_) {
+      const char *class_ = pci_class2text(e.class_);
+      if (strcmp(class_, "NOT_DEFINED") != 0) printf(" [%s]", class_);
     }
     print_id(e);
     printf("\n");
@@ -47,7 +47,7 @@ void usb_printit(struct pciusb_entries entries) {
   for (i = 0; i < entries.nb; i++) {
     struct pciusb_entry e = entries.entries[i];
     print_name(e);
-    if (e.class) printf(" [%s]", usb_class2text(e.class));
+    if (e.class_) printf(" [%s]", usb_class2text(e.class_));
     print_id(e);
     printf("\n");
   }
diff --git a/pci.c b/pci.c
index 2726b63..cb9ae45 100644
--- a/pci.c
+++ b/pci.c
@@ -36,7 +36,7 @@ extern struct pciusb_entries pci_probe(int probe_type) {
       snprintf(file, sizeof(file), "/proc/bus/pci/%02x/%02x.%d", e.pci_bus, e.pci_device, e.pci_function);
       if (probe_type == 1 && (f = fopen(file, "r"))) {
         if (fseek(f, 10, SEEK_SET) == 0) 
-	  fread(&e.class, 2, 1, f);
+	  fread(&e.class_, 2, 1, f);
         if (fseek(f, 0x2c, SEEK_SET) == 0) 
 	  fread(&e.subvendor, 2, 1, f), fread(&e.subdevice, 2, 1, f);
 
@@ -49,7 +49,7 @@ extern struct pciusb_entries pci_probe(int probe_type) {
         if (fseek(f, 9, SEEK_SET) == 0) {
 	  unsigned char class_prog = 0;
 	  fread(&class_prog, 1, 1, f);
-	  if (e.class == PCI_CLASS_SERIAL_USB) {
+	  if (e.class_ == PCI_CLASS_SERIAL_USB) {
 	    /* taken from kudzu's pci.c */
 	    e.module = strdup(class_prog == 0 ? "usb-uhci" : "usb-ohci");
 	  }
diff --git a/pciusb.c b/pciusb.c
index d36ac30..ecbae72 100644
--- a/pciusb.c
+++ b/pciusb.c
@@ -121,7 +121,7 @@ extern void pciusb_initialize(struct pciusb_entry *e) {
   e->device = 0xffff;
   e->subvendor = 0xffff;
   e->subdevice = 0xffff;
-  e->class = 0;
+  e->class_ = 0;
   e->pci_bus = 0xffff;
   e->pci_device = 0xffff;
   e->pci_function = 0xffff;
diff --git a/usb.c b/usb.c
index 84b54d5..4ecf398 100644
--- a/usb.c
+++ b/usb.c
@@ -29,10 +29,10 @@ extern struct pciusb_entries usb_probe(void) {
 	fprintf(stderr, "%s %d: unknown ``P'' line\n", file, line);
 	pciusb_initialize(e);
       }
-    } else if (e && buf[0] == 'I' && e->class == 0) {
-      int class, sub, prot = 0;
-      if (sscanf(buf, "I:  If#=%*2d Alt=%*2d #EPs=%*2d Cls=%02x(%*5c) Sub=%02x Prot=%02x", &class, &sub, &prot) == 3) {
-	e->class = (class * 0x100 + sub) * 0x100 + prot;
+    } else if (e && buf[0] == 'I' && e->class_ == 0) {
+      int class_, sub, prot = 0;
+      if (sscanf(buf, "I:  If#=%*2d Alt=%*2d #EPs=%*2d Cls=%02x(%*5c) Sub=%02x Prot=%02x", &class_, &sub, &prot) == 3) {
+	e->class_ = (class_ * 0x100 + sub) * 0x100 + prot;
       } else {
 	fprintf(stderr, "%s %d: unknown ``I'' line\n", file, line);
       }