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

Bugfix/c89 compile fixes (#327)

Browse Source 
* Fix code to be able to compile with older C89 ANSI compilers

* Convert C++ comments to C89 comments.

* default to std=gnu89

* Fix to enable CMake 3.1 to build on Centos7

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-08-23 13:37:32 -05:00
committed by GitHub
parent 065d0334ee
commit 95b487ea6f
16 changed files with 85 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/binding/address.c
+2 -2
View File
@@ -302,7 +302,7 @@ bool address_mac_from_ascii(BACNET_MAC_ADDRESS *mac, const char *arg)
{
unsigned a[6] = { 0 }, p = 0;
uint16_t port = 0;
int c;
int c, i;
bool status = false;
if (!(mac && arg)) {
@@ -327,7 +327,7 @@ bool address_mac_from_ascii(BACNET_MAC_ADDRESS *mac, const char *arg)
&a[4], &a[5]);
if (c > 0) {
for (int i = 0; i < c; i++) {
for (i = 0; i < c; i++) {
mac->adr[i] = a[i];
}
mac->len = c;
src/bacnet/basic/object/channel.c
+5 -5
View File
@@ -1521,11 +1521,11 @@ bool Channel_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
}
break;
case PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES:
// FIXME: add property handling
// status =
// Channel_List_Of_Object_Property_References_Set(
// wp_data,
// &value);
/* FIXME: add property handling */
/* status = */
/* Channel_List_Of_Object_Property_References_Set( */
/* wp_data, */
/* &value); */
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code =
ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED;
src/bacnet/basic/object/lo.c
+2 -2
View File
@@ -394,10 +394,10 @@ bool Lighting_Output_Lighting_Command_Set(
index = Lighting_Output_Instance_To_Index(object_instance);
if (index < MAX_LIGHTING_OUTPUTS) {
// FIXME: check lighting command member values
/* FIXME: check lighting command member values */
status = lighting_command_copy(
&Lighting_Output[index].Lighting_Command, value);
// FIXME: set all the other values, and get the light levels moving
/* FIXME: set all the other values, and get the light levels moving */
}
return status;
src/bacnet/basic/object/nc.c
+2 -1
View File
@@ -86,6 +86,7 @@ void Notification_Class_Property_Lists(
void Notification_Class_Init(void)
{
uint8_t NotifyIdx = 0;
unsigned i;
for (NotifyIdx = 0; NotifyIdx < MAX_NOTIFICATION_CLASSES; NotifyIdx++) {
/* init with zeros */
@@ -99,7 +100,7 @@ void Notification_Class_Init(void)
NC_Info[NotifyIdx].Priority[TRANSITION_TO_NORMAL] =
255; /* PRINTF lowest priority for Normal message. */
/* configure for every day, all day long */
for (unsigned i = 0; i < MAX_BACNET_DAYS_OF_WEEK; i++) {
for (i = 0; i < MAX_BACNET_DAYS_OF_WEEK; i++) {
NC_Info[NotifyIdx].Recipient_List->ValidDays |= (1<<i);
}
NC_Info[NotifyIdx].Recipient_List->FromTime.hour = 0;
src/bacnet/basic/object/trendlog.c
+3 -3
View File
@@ -674,15 +674,15 @@ bool Trend_Log_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
len = bacapp_decode_device_obj_property_ref(
wp_data->application_data, &TempSource);
if ((len < 0) ||
(len > wp_data->application_data_len)) // Hmm, that didn't go
// as planned...
(len > wp_data->application_data_len)) /* Hmm, that didn't go */
/* as planned... */
{
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_OTHER;
break;
}
// We only support references to objects in ourself for now
/* We only support references to objects in ourself for now */
if ((TempSource.deviceIdentifier.type == OBJECT_DEVICE) &&
(TempSource.deviceIdentifier.instance !=
Device_Object_Instance_Number())) {
src/bacnet/basic/service/h_rpm.c
+14 -14
View File
@@ -287,8 +287,8 @@ void handler_read_property_multiple(uint8_t *service_request,
#endif
error = len;
berror = true;
break; // The berror flag ensures that both loops will
// be broken!
break; /* The berror flag ensures that both loops will */
/* be broken! */
}
decode_len += len;
/* handle the special properties */
@@ -320,8 +320,8 @@ void handler_read_property_multiple(uint8_t *service_request,
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
error = BACNET_STATUS_ABORT;
berror = true;
break; // The berror flag ensures that both
// loops will be broken!
break; /* The berror flag ensures that both */
/* loops will be broken! */
}
apdu_len += len;
@@ -342,8 +342,8 @@ void handler_read_property_multiple(uint8_t *service_request,
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
error = BACNET_STATUS_ABORT;
berror = true;
break; // The berror flag ensures that both
// loops will be broken!
break; /* The berror flag ensures that both */
/* loops will be broken! */
}
apdu_len += len;
} else {
@@ -379,8 +379,8 @@ void handler_read_property_multiple(uint8_t *service_request,
#endif
error = len;
berror = true;
break; // The berror flag ensures that
// both loops will be broken!
break; /* The berror flag ensures that */
/* both loops will be broken! */
}
}
}
@@ -399,8 +399,8 @@ void handler_read_property_multiple(uint8_t *service_request,
#endif
error = len;
berror = true;
break; // The berror flag ensures that both loops
// will be broken!
break; /* The berror flag ensures that both loops */
/* will be broken! */
}
}
@@ -421,14 +421,14 @@ void handler_read_property_multiple(uint8_t *service_request,
ERROR_CODE_ABORT_SEGMENTATION_NOT_SUPPORTED;
error = BACNET_STATUS_ABORT;
berror = true;
break; // The berror flag ensures that both loops
// will be broken!
break; /* The berror flag ensures that both loops */
/* will be broken! */
} else {
apdu_len += copy_len;
}
break; /* finished with this property list */
}
} // for(;;)
} /* for(;;) */
if (berror) {
break;
}
@@ -436,7 +436,7 @@ void handler_read_property_multiple(uint8_t *service_request,
/* Reached the end so finish up */
break;
}
} // for(;;)
} /* for(;;) */
/* If not having an error so far, check the remaining space. */
if (!berror) {
src/bacnet/basic/service/s_cov.c
+2 -2
View File
@@ -143,11 +143,11 @@ uint8_t Send_COV_Subscribe(
&Handler_Transmit_Buffer[0], &dest, &my_address, &npdu_data);
/* encode the APDU portion of the packet */
if (cov_data->covSubscribeToProperty) {
// subscribe to 1 property
/* subscribe to 1 property */
len = cov_subscribe_property_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
sizeof(Handler_Transmit_Buffer) - pdu_len, invoke_id, cov_data);
} else {
// subscribe to object
/* subscribe to object */
len = cov_subscribe_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
sizeof(Handler_Transmit_Buffer) - pdu_len, invoke_id, cov_data);
}
src/bacnet/basic/sys/ringbuf.h
+2
View File
@@ -69,6 +69,7 @@ extern "C" {
/* tail */
BACNET_STACK_EXPORT
volatile void *Ringbuf_Peek(RING_BUFFER const *b);
BACNET_STACK_EXPORT
bool Ringbuf_Pop(RING_BUFFER * b,
uint8_t * data_element);
BACNET_STACK_EXPORT
@@ -85,6 +86,7 @@ extern "C" {
/* pair of functions to use head memory directly */
BACNET_STACK_EXPORT
volatile void *Ringbuf_Data_Peek(RING_BUFFER * b);
BACNET_STACK_EXPORT
volatile void *Ringbuf_Peek_Next(RING_BUFFER const *b,
uint8_t * data_element);
BACNET_STACK_EXPORT