Clean "types-limits" warnings (#766)
This commit is contained in:
+1
-2
@@ -159,8 +159,7 @@ BACNET_ERROR_CODE abort_convert_to_error_code(BACNET_ABORT_REASON abort_code)
|
|||||||
error_code = ERROR_CODE_ABORT_APDU_TOO_LONG;
|
error_code = ERROR_CODE_ABORT_APDU_TOO_LONG;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if ((abort_code >= ABORT_REASON_PROPRIETARY_FIRST) &&
|
if (abort_code >= ABORT_REASON_PROPRIETARY_FIRST) {
|
||||||
(abort_code <= ABORT_REASON_PROPRIETARY_LAST)) {
|
|
||||||
error_code = ERROR_CODE_ABORT_PROPRIETARY;
|
error_code = ERROR_CODE_ABORT_PROPRIETARY;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
+3
-3
@@ -954,7 +954,7 @@ int bacapp_encode_context_data_value(
|
|||||||
BACNET_APPLICATION_TAG
|
BACNET_APPLICATION_TAG
|
||||||
bacapp_context_tag_type(BACNET_PROPERTY_ID property, uint8_t tag_number)
|
bacapp_context_tag_type(BACNET_PROPERTY_ID property, uint8_t tag_number)
|
||||||
{
|
{
|
||||||
BACNET_APPLICATION_TAG tag = MAX_BACNET_APPLICATION_TAG;
|
int tag = MAX_BACNET_APPLICATION_TAG;
|
||||||
|
|
||||||
(void)tag_number;
|
(void)tag_number;
|
||||||
tag = bacapp_known_property_tag(MAX_BACNET_OBJECT_TYPE, property);
|
tag = bacapp_known_property_tag(MAX_BACNET_OBJECT_TYPE, property);
|
||||||
@@ -962,7 +962,7 @@ bacapp_context_tag_type(BACNET_PROPERTY_ID property, uint8_t tag_number)
|
|||||||
tag = MAX_BACNET_APPLICATION_TAG;
|
tag = MAX_BACNET_APPLICATION_TAG;
|
||||||
}
|
}
|
||||||
|
|
||||||
return tag;
|
return (BACNET_APPLICATION_TAG)tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1615,7 +1615,7 @@ int bacapp_decode_known_property(
|
|||||||
BACNET_PROPERTY_ID property)
|
BACNET_PROPERTY_ID property)
|
||||||
{
|
{
|
||||||
int apdu_len = 0;
|
int apdu_len = 0;
|
||||||
BACNET_APPLICATION_TAG tag;
|
int tag;
|
||||||
|
|
||||||
if (bacnet_is_closing_tag(apdu, apdu_size)) {
|
if (bacnet_is_closing_tag(apdu, apdu_size)) {
|
||||||
if (value) {
|
if (value) {
|
||||||
|
|||||||
@@ -568,14 +568,12 @@ bool Multistate_Input_Reliability_Set(
|
|||||||
|
|
||||||
pObject = Multistate_Input_Object(object_instance);
|
pObject = Multistate_Input_Object(object_instance);
|
||||||
if (pObject) {
|
if (pObject) {
|
||||||
if (value <= RELIABILITY_PROPRIETARY_MAX) {
|
fault = Multistate_Input_Object_Fault(pObject);
|
||||||
fault = Multistate_Input_Object_Fault(pObject);
|
pObject->Reliability = value;
|
||||||
pObject->Reliability = value;
|
if (fault != Multistate_Input_Object_Fault(pObject)) {
|
||||||
if (fault != Multistate_Input_Object_Fault(pObject)) {
|
pObject->Change_Of_Value = true;
|
||||||
pObject->Change_Of_Value = true;
|
|
||||||
}
|
|
||||||
status = true;
|
|
||||||
}
|
}
|
||||||
|
status = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
|
|||||||
@@ -568,14 +568,12 @@ bool Multistate_Value_Reliability_Set(
|
|||||||
|
|
||||||
pObject = Multistate_Value_Object(object_instance);
|
pObject = Multistate_Value_Object(object_instance);
|
||||||
if (pObject) {
|
if (pObject) {
|
||||||
if (value <= RELIABILITY_PROPRIETARY_MAX) {
|
fault = Multistate_Value_Object_Fault(pObject);
|
||||||
fault = Multistate_Value_Object_Fault(pObject);
|
pObject->Reliability = value;
|
||||||
pObject->Reliability = value;
|
if (fault != Multistate_Value_Object_Fault(pObject)) {
|
||||||
if (fault != Multistate_Value_Object_Fault(pObject)) {
|
pObject->Change_Of_Value = true;
|
||||||
pObject->Change_Of_Value = true;
|
|
||||||
}
|
|
||||||
status = true;
|
|
||||||
}
|
}
|
||||||
|
status = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
|
|||||||
+1
-2
@@ -141,8 +141,7 @@ BACNET_ERROR_CODE reject_convert_to_error_code(BACNET_REJECT_REASON reject_code)
|
|||||||
error_code = ERROR_CODE_INVALID_DATA_ENCODING;
|
error_code = ERROR_CODE_INVALID_DATA_ENCODING;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if ((reject_code >= REJECT_REASON_PROPRIETARY_FIRST) &&
|
if (reject_code >= REJECT_REASON_PROPRIETARY_FIRST) {
|
||||||
(reject_code <= REJECT_REASON_PROPRIETARY_LAST)) {
|
|
||||||
error_code = ERROR_CODE_REJECT_PROPRIETARY;
|
error_code = ERROR_CODE_REJECT_PROPRIETARY;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user