a little cleanup

3 files changed, 11 insertions, 11 deletions

diff --git a/generate_pciclass.pl b/generate_pciclass.pl
index 77d0c40..2e31701 100644
--- a/generate_pciclass.pl
+++ b/generate_pciclass.pl
@@ -2,10 +2,10 @@
 
 print q(/* This auto-generated from <pci.h>, don't modify! */
 
-struct {
+static struct {
   unsigned short id;
   const char *name;
-} pciclasses[] = {
+} classes[] = {
 );
 
 /^#define PCI_CLASS_(\w+)\s+(0x\w{4})/ and print qq(  { $2, "$1" },\n) while <>;
@@ -13,12 +13,12 @@ struct {
 print '
 };
 
-int nb_pciclasses = sizeof(pciclasses) / sizeof(*pciclasses);
+static int nb_classes = sizeof(classes) / sizeof(*classes);
 
 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;
+  for (i = 0; i < nb_classes; i++)
+    if (classes[i].id == class_) return classes[i].name;
 
   return pci_class2text(0);
 }
diff --git a/generate_usbclass.pl b/generate_usbclass.pl
index 7e2dad3..95ac6b8 100755
--- a/generate_usbclass.pl
+++ b/generate_usbclass.pl
@@ -2,10 +2,10 @@
 
 print q(/* This is auto-generated from </usr/share/usb.ids>, don't modify! */
 
-struct {
+static struct {
   unsigned long id;
   const char *name;
-} usbclasses[] = {
+} classes[] = {
 );
 
 while (<>) {
@@ -32,12 +32,12 @@ print sort @everything;
 print '
 };
 
-int nb_usbclasses = sizeof(usbclasses) / sizeof(*usbclasses);
+static int nb_classes = sizeof(classes) / sizeof(*classes);
 
 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;
+  for (i = 0; i < nb_classes; i++)
+    if (classes[i].id == class_) return classes[i].name;
 
   return "";
 }
diff --git a/usb.c b/usb.c
index 24206a9..004eaa7 100644
--- a/usb.c
+++ b/usb.c
@@ -1,8 +1,8 @@
-#include <unistd.h>
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "libldetect.h"
 #include "libldetect-private.h"
 #include "common.h"