From: Mantas Mikulėnas <grawity@gmail.com>
Date: Thu, 6 Dec 2012 21:34:25 +0000 (+0200)
Subject: hwdb: ids-update: close the right file handles
X-Git-Tag: v197~139
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f9cd22249dbdcebe2ab54eea56c0b32e2a1c2ce5

hwdb: ids-update: close the right file handles

The script was closing *INP and *OUTP, which never actually existed.

Also fix pci_vendor() opening usb.ids and immediately discarding the fh.
---

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 869c49b86..9ab754c64 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -34,8 +34,8 @@ sub usb_vendor {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub usb_classes {
@@ -100,15 +100,14 @@ sub usb_classes {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub pci_vendor {
         my $vendor;
         my $device;
 
-        open(IN, "<", "usb.ids");
         open(IN, "<", "pci.ids");
         open(OUT, ">", "20-pci-vendor-product.hwdb");
         print(OUT "# This file is part of systemd.\n" .
@@ -149,8 +148,8 @@ sub pci_vendor {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub pci_classes {
@@ -203,8 +202,8 @@ sub pci_classes {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub oui {
@@ -237,7 +236,7 @@ sub oui {
                         print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
                 }
         }
-        close(INP);
+        close(IN);
 
         open(IN, "<", "oui.txt");
         while (my $line = <IN>) {
@@ -255,8 +254,8 @@ sub oui {
                         }
                 }
         }
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 usb_vendor();