From e248d6e421caed0ccc58f5f62a992d8ba53c0e5c Mon Sep 17 00:00:00 2001
From: Stefan Wahren <info@lategoodbye.de>
Date: Mon, 31 Dec 2012 13:44:03 +0100
Subject: [PATCH] replace address parameter checks with new helper functions

---
 bin/mbus-serial-request-data-multi-reply.c | 2 +-
 bin/mbus-serial-request-data.c             | 2 +-
 bin/mbus-serial-scan-secondary.c           | 2 +-
 bin/mbus-serial-select-secondary.c         | 2 +-
 bin/mbus-tcp-request-data-multi-reply.c    | 2 +-
 bin/mbus-tcp-request-data.c                | 2 +-
 bin/mbus-tcp-scan-secondary.c              | 2 +-
 bin/mbus-tcp-select-secondary.c            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/mbus-serial-request-data-multi-reply.c b/bin/mbus-serial-request-data-multi-reply.c
index 2213755..d0c06d1 100755
--- a/bin/mbus-serial-request-data-multi-reply.c
+++ b/bin/mbus-serial-request-data-multi-reply.c
@@ -121,7 +121,7 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (strlen(addr_str) == 16)
+    if (mbus_is_secondary_address(addr_str))
     {
         // secondary addressing
 
diff --git a/bin/mbus-serial-request-data.c b/bin/mbus-serial-request-data.c
index e4e22e1..74dacf3 100755
--- a/bin/mbus-serial-request-data.c
+++ b/bin/mbus-serial-request-data.c
@@ -88,7 +88,7 @@ main(int argc, char **argv)
     }
 
 
-    if (strlen(addr_str) == 16)
+    if (mbus_is_secondary_address(addr_str))
     {
         // secondary addressing
 
diff --git a/bin/mbus-serial-scan-secondary.c b/bin/mbus-serial-scan-secondary.c
index e85355e..bb04e2f 100755
--- a/bin/mbus-serial-scan-secondary.c
+++ b/bin/mbus-serial-scan-secondary.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
         return 1;
     }
  
-    if (strlen(addr_mask) != 16)
+    if (mbus_is_secondary_address(addr_mask))
     {
         fprintf(stderr, "Misformatted secondary address mask. Must be 16 character HEX number.\n");
         free(addr_mask);
diff --git a/bin/mbus-serial-select-secondary.c b/bin/mbus-serial-select-secondary.c
index ad4a883..87f5b80 100755
--- a/bin/mbus-serial-select-secondary.c
+++ b/bin/mbus-serial-select-secondary.c
@@ -49,7 +49,7 @@ main(int argc, char **argv)
         return 1;
     }
  
-    if (strlen(addr) != 16)
+    if (mbus_is_secondary_address(addr) == 0)
     {
         printf("Misformatted secondary address. Must be 16 character HEX number.\n");
         return 1;
diff --git a/bin/mbus-tcp-request-data-multi-reply.c b/bin/mbus-tcp-request-data-multi-reply.c
index e682c1e..2b65c31 100755
--- a/bin/mbus-tcp-request-data-multi-reply.c
+++ b/bin/mbus-tcp-request-data-multi-reply.c
@@ -81,7 +81,7 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (strlen(addr_str) == 16)
+    if (mbus_is_secondary_address(addr_str))
     {
         // secondary addressing
 
diff --git a/bin/mbus-tcp-request-data.c b/bin/mbus-tcp-request-data.c
index 70aa4ee..07f72bf 100755
--- a/bin/mbus-tcp-request-data.c
+++ b/bin/mbus-tcp-request-data.c
@@ -70,7 +70,7 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (strlen(addr_str) == 16)
+    if (mbus_is_secondary_address(addr_str))
     {
         // secondary addressing
 
diff --git a/bin/mbus-tcp-scan-secondary.c b/bin/mbus-tcp-scan-secondary.c
index 761d86d..42d5565 100755
--- a/bin/mbus-tcp-scan-secondary.c
+++ b/bin/mbus-tcp-scan-secondary.c
@@ -53,7 +53,7 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (strlen(addr_mask) != 16)
+    if (mbus_is_secondary_address(addr_mask) == 0)
     {
         fprintf(stderr, "Misformatted secondary address mask. Must be 16 character HEX number.\n");
         return 1;
diff --git a/bin/mbus-tcp-select-secondary.c b/bin/mbus-tcp-select-secondary.c
index e894a97..904bd27 100755
--- a/bin/mbus-tcp-select-secondary.c
+++ b/bin/mbus-tcp-select-secondary.c
@@ -40,7 +40,7 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (strlen(addr) != 16)
+    if (mbus_is_secondary_address(addr) == 0)
     {
         printf("Misformatted secondary address. Must be 16 character HEX number.\n");
         return 1;