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>

diff --git a/perllib/phash.ph b/perllib/phash.ph
index 6b31f0a..5bc2744 100644 (file)
--- 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 e1071b2..cc9ca74 100755 (executable)
--- 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() {