Feature/refactor-apps-string-parsing (#1152)
* Added bacnet_str functions for parsing various numeric strings. * Renamed BACnet string API to be clearer when no stdlib function exists. * Fixed incompatible types - from 'BACNET_UNSIGNED_INTEGER *' to 'unsigned long *' warning * Changed bacnet-str-to functions to use ERANGE for error detection. * Refactored some apps to use common string parsing for BACnet data types. * Refactor bacapp_parse_application_data to use bacnet_string_to_unsigned for better clarity * Added strtol for BACnetEventType.
This commit is contained in:
+9
-2
@@ -329,7 +329,10 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
} else if (strcmp(argv[argi], "--dnet") == 0) {
|
||||
if (++argi < argc) {
|
||||
dnet = strtol(argv[argi], NULL, 0);
|
||||
if (!bacnet_strtol(argv[argi], &dnet)) {
|
||||
fprintf(stderr, "dnet=%s invalid\n", argv[argi]);
|
||||
return 1;
|
||||
}
|
||||
if ((dnet >= 0) && (dnet <= BACNET_BROADCAST_NETWORK)) {
|
||||
specific_address = true;
|
||||
}
|
||||
@@ -359,7 +362,11 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
} else {
|
||||
if (target_args == 0) {
|
||||
Target_Device_Object_Instance = strtol(argv[argi], NULL, 0);
|
||||
if (!bacnet_string_to_uint32(
|
||||
argv[argi], &Target_Device_Object_Instance)) {
|
||||
fprintf(stderr, "device-instance=%s invalid\n", argv[argi]);
|
||||
return 1;
|
||||
}
|
||||
target_args++;
|
||||
} else if (target_args == 1) {
|
||||
APDU_Hex_ASCII = argv[argi];
|
||||
|
||||
Reference in New Issue
Block a user