Convert the property list values into int32_t to support the larger property values when an int is 8-bit or 16-bit. (#1145)
This commit is contained in:
@@ -56,7 +56,7 @@ struct object_data {
|
||||
};
|
||||
|
||||
/* These three arrays are used by the ReadPropertyMultiple handler */
|
||||
static const int Properties_Required[] = {
|
||||
static const int32_t Properties_Required[] = {
|
||||
/* unordered list of required properties */
|
||||
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME,
|
||||
PROP_OBJECT_TYPE, PROP_PROGRAM_STATE,
|
||||
@@ -64,7 +64,7 @@ static const int Properties_Required[] = {
|
||||
PROP_OUT_OF_SERVICE, -1
|
||||
};
|
||||
|
||||
static const int Properties_Optional[] = {
|
||||
static const int32_t Properties_Optional[] = {
|
||||
/* unordered list of optional properties */
|
||||
PROP_REASON_FOR_HALT,
|
||||
PROP_DESCRIPTION_OF_HALT,
|
||||
@@ -75,7 +75,7 @@ static const int Properties_Optional[] = {
|
||||
-1
|
||||
};
|
||||
|
||||
static const int Properties_Proprietary[] = { -1 };
|
||||
static const int32_t Properties_Proprietary[] = { -1 };
|
||||
|
||||
/**
|
||||
* Returns the list of required, optional, and proprietary properties.
|
||||
@@ -89,7 +89,9 @@ static const int Properties_Proprietary[] = { -1 };
|
||||
* BACnet proprietary properties for this object.
|
||||
*/
|
||||
void Program_Property_Lists(
|
||||
const int **pRequired, const int **pOptional, const int **pProprietary)
|
||||
const int32_t **pRequired,
|
||||
const int32_t **pOptional,
|
||||
const int32_t **pProprietary)
|
||||
{
|
||||
if (pRequired) {
|
||||
*pRequired = Properties_Required;
|
||||
|
||||
Reference in New Issue
Block a user