replace address parameter checks with new helper functions
This commit is contained in:
parent
898ee57d41
commit
e248d6e421
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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);
|
||||||
|
@ -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;
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user