wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace address parameter checks with new helper functions

Browse Source
This commit is contained in:
Stefan Wahren 2012-12-31 13:44:03 +01:00
parent 898ee57d41
commit e248d6e421
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/mbus-serial-request-data-multi-reply.c
View File

@ -121,7 +121,7 @@ main(int argc, char **argv)
return 1; return 1;
} }
if (strlen(addr_str) == 16) if (mbus_is_secondary_address(addr_str))
{ {
// secondary addressing // secondary addressing

2
bin/mbus-serial-request-data.c
View File

@ -88,7 +88,7 @@ main(int argc, char **argv)
} }
if (strlen(addr_str) == 16) if (mbus_is_secondary_address(addr_str))
{ {
// secondary addressing // secondary addressing

2
bin/mbus-serial-scan-secondary.c
View File

@ -128,7 +128,7 @@ main(int argc, char **argv)
return 1; 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"); fprintf(stderr, "Misformatted secondary address mask. Must be 16 character HEX number.\n");
free(addr_mask); free(addr_mask);

2
bin/mbus-serial-select-secondary.c
View File

@ -49,7 +49,7 @@ main(int argc, char **argv)
return 1; return 1;
} }
if (strlen(addr) != 16) if (mbus_is_secondary_address(addr) == 0)
{ {
printf("Misformatted secondary address. Must be 16 character HEX number.\n"); printf("Misformatted secondary address. Must be 16 character HEX number.\n");
return 1; return 1;

2
bin/mbus-tcp-request-data-multi-reply.c
View File

@ -81,7 +81,7 @@ main(int argc, char **argv)
return 1; return 1;
} }
if (strlen(addr_str) == 16) if (mbus_is_secondary_address(addr_str))
{ {
// secondary addressing // secondary addressing

2
bin/mbus-tcp-request-data.c
View File

@ -70,7 +70,7 @@ main(int argc, char **argv)
return 1; return 1;
} }
if (strlen(addr_str) == 16) if (mbus_is_secondary_address(addr_str))
{ {
// secondary addressing // secondary addressing

2
bin/mbus-tcp-scan-secondary.c
View File

@ -53,7 +53,7 @@ main(int argc, char **argv)
return 1; 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"); fprintf(stderr, "Misformatted secondary address mask. Must be 16 character HEX number.\n");
return 1; return 1;

2
bin/mbus-tcp-select-secondary.c
View File

@ -40,7 +40,7 @@ main(int argc, char **argv)
return 1; return 1;
} }
if (strlen(addr) != 16) if (mbus_is_secondary_address(addr) == 0)
{ {
printf("Misformatted secondary address. Must be 16 character HEX number.\n"); printf("Misformatted secondary address. Must be 16 character HEX number.\n");
return 1; return 1;