picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Mantas Mikulėnas 2012-12-06 23:34:25 +02:00 committed by Kay Sievers
parent 7b683869dc
commit f9cd22249d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hwdb/ids-update.pl
View File

@ -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();