Add some more tests; minor code cleanup.

[hath.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index d8c760080df39c9cf2d0a29021b2271ea970adb4..e57959e460e964d9beec7f09995dd40d5f84aae0 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -30,8 +30,8 @@ import CommandLine (help_set,
                     parse_mode)
 
 import DNS (Domain, lookup_ptrs)
-import ExitCodes
-import Octet
+import ExitCodes ( exit_args_parse_failed, exit_invalid_cidr )
+import Octet ()
 
 
 -- | A regular expression that matches a non-address character.
@@ -63,14 +63,14 @@ cidr_to_regex cidr =
       range2 = numeric_range min2 max2
       range3 = numeric_range min3 max3
       range4 = numeric_range min4 max4
-      min1   = octet_to_int (min_octet1 cidr)
-      min2   = octet_to_int (min_octet2 cidr)
-      min3   = octet_to_int (min_octet3 cidr)
-      min4   = octet_to_int (min_octet4 cidr)
-      max1   = octet_to_int (max_octet1 cidr)
-      max2   = octet_to_int (max_octet2 cidr)
-      max3   = octet_to_int (max_octet3 cidr)
-      max4   = octet_to_int (max_octet4 cidr)
+      min1   = fromEnum (min_octet1 cidr)
+      min2   = fromEnum (min_octet2 cidr)
+      min3   = fromEnum (min_octet3 cidr)
+      min4   = fromEnum (min_octet4 cidr)
+      max1   = fromEnum (max_octet1 cidr)
+      max2   = fromEnum (max_octet2 cidr)
+      max3   = fromEnum (max_octet3 cidr)
+      max4   = fromEnum (max_octet4 cidr)