summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-09-22 14:02:28 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-09-22 14:02:28 -0700
commit0e7370cfa64b9cfe81d4ce9a5f0a07203836f9c7 (patch)
tree978a59d597c0c907fc053284ac5db85e5834428e
parent8fe1f65087dfa40e351b4afceb3c9b5b1f985d91 (diff)
downloadnasm-0e7370cfa64b9cfe81d4ce9a5f0a07203836f9c7.tar.gz
phash: move sample function to the sample file
read_input() shouldn't be part of the phash.ph module; instead it should go into the sample usage file phash.pl. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--perllib/phash.ph26
-rwxr-xr-xphash.pl26
2 files changed, 26 insertions, 26 deletions
diff --git a/perllib/phash.ph b/perllib/phash.ph
index 6b31f0a0..5bc2744a 100644
--- a/perllib/phash.ph
+++ b/perllib/phash.ph
@@ -170,32 +170,6 @@ sub gen_perfect_hash($) {
}
#
-# Read input file
-#
-sub read_input() {
- my $key,$val;
- my %out;
- my $x = 0;
-
- while (defined($l = <STDIN>)) {
- chomp $l;
- $l =~ s/\s*(\#.*|)$//;
-
- next if ($l eq '');
-
- if ($l =~ /^([^=]+)\=([^=]+)$/) {
- $out{$1} = $2;
- $x = $2;
- } else {
- $out{$l} = $x;
- }
- $x++;
- }
-
- return %out;
-}
-
-#
# Verify that the hash table is actually correct...
#
sub verify_hash_table($$)
diff --git a/phash.pl b/phash.pl
index e1071b2e..cc9ca741 100755
--- a/phash.pl
+++ b/phash.pl
@@ -38,6 +38,32 @@
require 'phash.ph';
#
+# Read input file
+#
+sub read_input() {
+ my $key,$val;
+ my %out;
+ my $x = 0;
+
+ while (defined($l = <STDIN>)) {
+ chomp $l;
+ $l =~ s/\s*(\#.*|)$//;
+
+ next if ($l eq '');
+
+ if ($l =~ /^([^=]+)\=([^=]+)$/) {
+ $out{$1} = $2;
+ $x = $2;
+ } else {
+ $out{$l} = $x;
+ }
+ $x++;
+ }
+
+ return %out;
+}
+
+#
# Main program
#
sub main() {