dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings found by splint (#324)

Browse Source 
* Fix warnings found by splint

* Ignore Win32 Builder warnings about possible data loss for integers.

* Fix Windows build warnings

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-08-17 23:23:26 -05:00
committed by GitHub
parent 8cddaa5881
commit c8671d54f7
15 changed files with 79 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ack-alarm/main.c
+5 -3
View File
@@ -235,6 +235,7 @@ int main(int argc, char *argv[])
time_t timeout_seconds = 0;
bool found = false;
long dnet = -1;
unsigned object_type = 0;
BACNET_MAC_ADDRESS mac = { 0 };
BACNET_MAC_ADDRESS adr = { 0 };
BACNET_ADDRESS dest = { 0 };
@@ -289,8 +290,8 @@ int main(int argc, char *argv[])
target_args++;
} else if (target_args == 2) {
/* event-object-type */
if (bactext_object_type_strtol(argv[argi],
&data.eventObjectIdentifier.type)) {
if (bactext_object_type_strtol(argv[argi], &object_type)) {
data.eventObjectIdentifier.type = object_type;
target_args++;
} else {
fprintf(stderr, "event-object-type=%s invalid\n",
@@ -305,7 +306,8 @@ int main(int argc, char *argv[])
} else if (target_args == 4) {
/* event-state-acked */
if (bactext_event_state_strtol(argv[argi],
&data.eventStateAcked)) {
&object_type)) {
data.eventStateAcked = object_type;
target_args++;
} else {
fprintf(stderr, "event-state=%s invalid\n",
apps/readprop/main.c
+9 -5
View File
@@ -252,6 +252,8 @@ int main(int argc, char *argv[])
BACNET_ADDRESS dest = { 0 };
bool specific_address = false;
int argi = 0;
unsigned object_type = 0;
unsigned object_property = 0;
unsigned int target_args = 0;
char *filename = NULL;
@@ -296,20 +298,22 @@ int main(int argc, char *argv[])
target_args++;
} else if (target_args == 1) {
if (bactext_object_type_strtol(
argv[argi], &Target_Object_Type) == false) {
argv[argi], &object_type) == false) {
fprintf(stderr, "object-type=%s invalid\n", argv[argi]);
return 1;
}
Target_Object_Type = object_type;
target_args++;
} else if (target_args == 2) {
Target_Object_Instance = strtol(argv[argi], NULL, 0);
target_args++;
} else if (target_args == 3) {
if (bactext_property_strtol(
argv[argi], &Target_Object_Property) == false) {
argv[argi], &object_property) == false) {
fprintf(stderr, "property=%s invalid\n", argv[argi]);
return 1;
}
Target_Object_Property = object_property;
target_args++;
} else if (target_args == 4) {
Target_Object_Index = strtol(argv[argi], NULL, 0);
@@ -399,7 +403,7 @@ int main(int argc, char *argv[])
}
if (Error_Detected) {
break;
}
}
/* wait until the device is bound, or timeout and quit */
if (!found) {
found = address_bind_request(
@@ -441,9 +445,9 @@ int main(int argc, char *argv[])
/* keep track of time for next check */
last_seconds = current_seconds;
}
if (Error_Detected) {
return 1;
}
}
return 0;
}
apps/readpropm/main.c
+3 -1
View File
@@ -359,6 +359,7 @@ int main(int argc, char *argv[])
int scan_count = 0;
int argi = 0;
long dnet = -1;
unsigned object_type = 0;
BACNET_MAC_ADDRESS mac = { 0 };
BACNET_MAC_ADDRESS adr = { 0 };
bool specific_address = false;
@@ -425,12 +426,13 @@ int main(int argc, char *argv[])
atexit(cleanup);
}
status = bactext_object_type_strtol(
argv[argi], &rpm_object->object_type);
argv[argi], &object_type);
if (status == false) {
fprintf(stderr, "Error: object-type=%s invalid\n",
argv[argi]);
return 1;
}
rpm_object->object_type = object_type;
if (rpm_object->object_type >= MAX_BACNET_OBJECT_TYPE) {
fprintf(stderr,
"object-type=%u - it must be less than %u\n",
apps/readrange/main.c
+9 -5
View File
@@ -203,6 +203,8 @@ int main(int argc, char *argv[])
int count = 0;
int hour, min, sec, hundredths;
int year, month, day, wday;
unsigned object_type = 0;
unsigned object_property = 0;
char *filename = NULL;
filename = filename_remove_path(argv[0]);
@@ -228,15 +230,17 @@ int main(int argc, char *argv[])
}
/* decode the command line parameters */
Target_Device_Object_Instance = strtol(argv[1], NULL, 0);
if (bactext_object_type_strtol(argv[2], &Target_Object_Type) == false) {
if (bactext_object_type_strtol(argv[2], &object_type) == false) {
fprintf(stderr, "object-type=%s invalid\n", argv[2]);
return 1;
}
Target_Object_Type = object_type;
Target_Object_Instance = strtol(argv[3], NULL, 0);
if (bactext_property_strtol(argv[4], &Target_Object_Property) == false) {
if (bactext_property_strtol(argv[4], &object_property) == false) {
fprintf(stderr, "property=%s invalid\n", argv[4]);
return 1;
}
Target_Object_Property = object_property;
Target_Object_Range_Type = strtol(argv[5], NULL, 0);
/* some bounds checking */
if (Target_Device_Object_Instance > BACNET_MAX_INSTANCE) {
@@ -356,7 +360,7 @@ int main(int argc, char *argv[])
}
if (Error_Detected) {
break;
}
}
/* wait until the device is bound, or timeout and quit */
if (!found) {
found = address_bind_request(
@@ -396,9 +400,9 @@ int main(int argc, char *argv[])
/* keep track of time for next check */
last_seconds = current_seconds;
}
if (Error_Detected) {
return 1;
}
}
return 0;
}
apps/server-client/main.c
+4 -2
View File
@@ -91,6 +91,7 @@ int main(int argc, char *argv[])
struct mstimer print_value_timer = { 0 };
float float_value = 0.0;
bool bool_value = false;
unsigned object_type = 0;
uint32_t unsigned_value = 0;
/* data from the command line */
unsigned long print_seconds = 10;
@@ -132,11 +133,12 @@ int main(int argc, char *argv[])
target_device_object_instance = strtol(argv[argi], NULL, 0);
target_args++;
} else if (target_args == 1) {
if (bactext_object_type_strtol(
argv[argi], &target_object_type) == false) {
if (bactext_object_type_strtol(argv[argi], &object_type) ==
false) {
fprintf(stderr, "object-type=%s invalid\n", argv[argi]);
return 1;
}
target_object_type = object_type;
target_args++;
} else if (target_args == 2) {
target_object_instance = strtol(argv[argi], NULL, 0);
apps/ucov/main.c
+6 -4
View File
@@ -73,7 +73,8 @@ int main(int argc, char *argv[])
BACNET_COV_DATA cov_data;
BACNET_PROPERTY_VALUE value_list;
uint8_t tag;
unsigned int uint;
unsigned object_type = 0;
unsigned object_property = 0;
if (argc < 7) {
/* note: priority 16 and 0 should produce the same end results... */
@@ -173,20 +174,21 @@ int main(int argc, char *argv[])
/* decode the command line parameters */
cov_data.subscriberProcessIdentifier = strtol(argv[1], NULL, 0);
cov_data.initiatingDeviceIdentifier = strtol(argv[2], NULL, 0);
if (bactext_object_type_strtol(argv[3], &uint) == false) {
if (bactext_object_type_strtol(argv[3], &object_type) == false) {
fprintf(stderr, "error: object-type=%s invalid\n", argv[3]);
return 1;
}
cov_data.monitoredObjectIdentifier.type = (uint16_t)uint;
cov_data.monitoredObjectIdentifier.type = (uint16_t)object_type;
cov_data.monitoredObjectIdentifier.instance = strtol(argv[4], NULL, 0);
cov_data.timeRemaining = strtol(argv[5], NULL, 0);
cov_data.listOfValues = &value_list;
value_list.next = NULL;
if (bactext_property_strtol(argv[6], &value_list.propertyIdentifier) ==
if (bactext_property_strtol(argv[6], &object_property) ==
false) {
fprintf(stderr, "property=%s invalid\n", argv[6]);
return 1;
}
value_list.propertyIdentifier = object_property;
tag = strtol(argv[7], NULL, 0);
value_string = argv[8];
/* optional priority */
apps/whohas/main.c
+5 -2
View File
@@ -135,6 +135,7 @@ int main(int argc, char *argv[])
time_t current_seconds = 0;
time_t timeout_seconds = 0;
int argi = 0;
unsigned object_type = 0;
bool by_name = false;
if (argc < 2) {
@@ -157,10 +158,11 @@ int main(int argc, char *argv[])
} else if (argc < 4) {
/* bacwh 8 1234 */
Target_Object_Instance_Min = Target_Object_Instance_Max = -1;
if (bactext_object_type_strtol(argv[1], &Target_Object_Type) == false) {
if (bactext_object_type_strtol(argv[1], &object_type) == false) {
fprintf(stderr, "object-type=%s invalid\n", argv[1]);
return 1;
}
Target_Object_Type = object_type;
Target_Object_Instance = strtol(argv[2], NULL, 0);
} else if (argc < 5) {
/* bacwh 0 4194303 "name" */
@@ -172,10 +174,11 @@ int main(int argc, char *argv[])
/* bacwh 0 4194303 8 1234 */
Target_Object_Instance_Min = strtol(argv[1], NULL, 0);
Target_Object_Instance_Max = strtol(argv[2], NULL, 0);
if (bactext_object_type_strtol(argv[3], &Target_Object_Type) == false) {
if (bactext_object_type_strtol(argv[3], &object_type) == false) {
fprintf(stderr, "object-type=%s invalid\n", argv[3]);
return 1;
}
Target_Object_Type = object_type;
Target_Object_Instance = strtol(argv[4], NULL, 0);
} else {
print_usage(filename_remove_path(argv[0]));
apps/writeprop/main.c
+6 -2
View File
@@ -239,6 +239,8 @@ int main(int argc, char *argv[])
uint16_t pdu_len = 0;
unsigned timeout = 100; /* milliseconds */
unsigned max_apdu = 0;
unsigned object_type = 0;
unsigned object_property = 0;
time_t elapsed_seconds = 0;
time_t last_seconds = 0;
time_t current_seconds = 0;
@@ -275,15 +277,17 @@ int main(int argc, char *argv[])
}
/* decode the command line parameters */
Target_Device_Object_Instance = strtol(argv[1], NULL, 0);
if (bactext_object_type_strtol(argv[2], &Target_Object_Type) == false) {
if (bactext_object_type_strtol(argv[2], &object_type) == false) {
fprintf(stderr, "object-type=%s invalid\n", argv[2]);
return 1;
}
Target_Object_Type = object_type;
Target_Object_Instance = strtol(argv[3], NULL, 0);
if (bactext_property_strtol(argv[4], &Target_Object_Property) == false) {
if (bactext_property_strtol(argv[4], &object_property) == false) {
fprintf(stderr, "property=%s invalid\n", argv[4]);
return 1;
}
Target_Object_Property = object_property;
Target_Object_Property_Priority = (uint8_t)strtol(argv[5], NULL, 0);
Target_Object_Property_Index = strtol(argv[6], NULL, 0);
if (Target_Object_Property_Index == -1) {
apps/writepropm/main.c
+4 -2
View File
@@ -277,6 +277,7 @@ int main(int argc, char *argv[])
bool status = false;
BACNET_APPLICATION_TAG property_tag;
uint8_t context_tag = 0;
unsigned object_type = 0;
unsigned property_id = 0;
unsigned property_array_index = 0;
int scan_count = 0;
@@ -318,12 +319,13 @@ int main(int argc, char *argv[])
arg_sets = 0;
while (wpm_object) {
tag_value_arg = 2 + (arg_sets * 6);
if (bactext_object_type_strtol(
argv[tag_value_arg], &wpm_object->object_type) == false) {
if (bactext_object_type_strtol(argv[tag_value_arg], &object_type) ==
false) {
fprintf(
stderr, "Error: object-type=%s invalid\n", argv[tag_value_arg]);
return 1;
}
wpm_object->object_type = object_type;
tag_value_arg++;
args_remaining--;
if (Verbose) {