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

Performed clang-tidy on files

Browse Source
This commit is contained in:
Steve Karg
2020-06-19 14:51:19 -05:00
parent 15dce68947
commit ca544e7ac1
2 changed files with 76 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacapp.c
+66 -33
View File
@@ -1085,8 +1085,9 @@ int bacapp_snprintf_value(
octet_str = octetstring_value(&value->type.Octet_String); octet_str = octetstring_value(&value->type.Octet_String);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
snprintf(temp_str, sizeof(temp_str), "%02X", *octet_str); snprintf(temp_str, sizeof(temp_str), "%02X", *octet_str);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
octet_str++; octet_str++;
} }
if (i == len) { if (i == len) {
@@ -1099,16 +1100,18 @@ int bacapp_snprintf_value(
case BACNET_APPLICATION_TAG_CHARACTER_STRING: case BACNET_APPLICATION_TAG_CHARACTER_STRING:
len = characterstring_length(&value->type.Character_String); len = characterstring_length(&value->type.Character_String);
char_str = characterstring_value(&value->type.Character_String); char_str = characterstring_value(&value->type.Character_String);
if (!append_str(&p_str, &rem_str_len, "\"")) if (!append_str(&p_str, &rem_str_len, "\"")) {
break; break;
}
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (isprint(*((unsigned char *)char_str))) { if (isprint(*((unsigned char *)char_str))) {
snprintf(temp_str, sizeof(temp_str), "%c", *char_str); snprintf(temp_str, sizeof(temp_str), "%c", *char_str);
} else { } else {
snprintf(temp_str, sizeof(temp_str), "%c", '.'); snprintf(temp_str, sizeof(temp_str), "%c", '.');
} }
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
char_str++; char_str++;
} }
if ((i == len) && append_str(&p_str, &rem_str_len, "\"")) { if ((i == len) && append_str(&p_str, &rem_str_len, "\"")) {
@@ -1121,18 +1124,21 @@ int bacapp_snprintf_value(
#if defined(BACAPP_BIT_STRING) #if defined(BACAPP_BIT_STRING)
case BACNET_APPLICATION_TAG_BIT_STRING: case BACNET_APPLICATION_TAG_BIT_STRING:
len = bitstring_bits_used(&value->type.Bit_String); len = bitstring_bits_used(&value->type.Bit_String);
if (!append_str(&p_str, &rem_str_len, "{")) if (!append_str(&p_str, &rem_str_len, "{")) {
break; break;
}
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
snprintf(temp_str, sizeof(temp_str), "%s", snprintf(temp_str, sizeof(temp_str), "%s",
bitstring_bit(&value->type.Bit_String, (uint8_t)i) bitstring_bit(&value->type.Bit_String, (uint8_t)i)
? "true" ? "true"
: "false"); : "false");
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
if (i < len - 1) { if (i < len - 1) {
if (!append_str(&p_str, &rem_str_len, ",")) if (!append_str(&p_str, &rem_str_len, ",")) {
break; break;
}
} }
} }
if ((i == len) && append_str(&p_str, &rem_str_len, "}")) { if ((i == len) && append_str(&p_str, &rem_str_len, "}")) {
@@ -1224,31 +1230,38 @@ int bacapp_snprintf_value(
#if defined(BACAPP_DATE) #if defined(BACAPP_DATE)
case BACNET_APPLICATION_TAG_DATE: case BACNET_APPLICATION_TAG_DATE:
if (!append_str(&p_str, &rem_str_len, if (!append_str(&p_str, &rem_str_len,
bactext_day_of_week_name(value->type.Date.wday))) bactext_day_of_week_name(value->type.Date.wday))) {
break; break;
if (!append_str(&p_str, &rem_str_len, ", ")) }
if (!append_str(&p_str, &rem_str_len, ", ")) {
break; break;
}
if (!append_str(&p_str, &rem_str_len, if (!append_str(&p_str, &rem_str_len,
bactext_month_name(value->type.Date.month))) bactext_month_name(value->type.Date.month))) {
break; break;
}
if (value->type.Date.day == 255) { if (value->type.Date.day == 255) {
if (!append_str(&p_str, &rem_str_len, " (unspecified), ")) if (!append_str(&p_str, &rem_str_len, " (unspecified), ")) {
break; break;
}
} else { } else {
snprintf(temp_str, sizeof(temp_str), " %u, ", snprintf(temp_str, sizeof(temp_str), " %u, ",
(unsigned)value->type.Date.day); (unsigned)value->type.Date.day);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} }
if (value->type.Date.year == 2155) { if (value->type.Date.year == 2155) {
if (!append_str(&p_str, &rem_str_len, "(unspecified)")) if (!append_str(&p_str, &rem_str_len, "(unspecified)")) {
break; break;
}
} else { } else {
snprintf(temp_str, sizeof(temp_str), "%u", snprintf(temp_str, sizeof(temp_str), "%u",
(unsigned)value->type.Date.year); (unsigned)value->type.Date.year);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} }
/* If we get here, then everything is OK. Indicate how many */ /* If we get here, then everything is OK. Indicate how many */
/* bytes were written. */ /* bytes were written. */
@@ -1258,40 +1271,48 @@ int bacapp_snprintf_value(
#if defined(BACAPP_TIME) #if defined(BACAPP_TIME)
case BACNET_APPLICATION_TAG_TIME: case BACNET_APPLICATION_TAG_TIME:
if (value->type.Time.hour == 255) { if (value->type.Time.hour == 255) {
if (!append_str(&p_str, &rem_str_len, "**:")) if (!append_str(&p_str, &rem_str_len, "**:")) {
break; break;
}
} else { } else {
snprintf(temp_str, sizeof(temp_str), snprintf(temp_str, sizeof(temp_str),
"%02u:", (unsigned)value->type.Time.hour); "%02u:", (unsigned)value->type.Time.hour);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} }
if (value->type.Time.min == 255) { if (value->type.Time.min == 255) {
if (!append_str(&p_str, &rem_str_len, "**:")) if (!append_str(&p_str, &rem_str_len, "**:")) {
break; break;
}
} else { } else {
snprintf(temp_str, sizeof(temp_str), snprintf(temp_str, sizeof(temp_str),
"%02u:", (unsigned)value->type.Time.min); "%02u:", (unsigned)value->type.Time.min);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} }
if (value->type.Time.sec == 255) { if (value->type.Time.sec == 255) {
if (!append_str(&p_str, &rem_str_len, "**.")) if (!append_str(&p_str, &rem_str_len, "**.")) {
break; break;
}
} else { } else {
snprintf(temp_str, sizeof(temp_str), "%02u.", snprintf(temp_str, sizeof(temp_str), "%02u.",
(unsigned)value->type.Time.sec); (unsigned)value->type.Time.sec);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} }
if (value->type.Time.hundredths == 255) { if (value->type.Time.hundredths == 255) {
if (!append_str(&p_str, &rem_str_len, "**")) if (!append_str(&p_str, &rem_str_len, "**")) {
break; break;
}
} else { } else {
snprintf(temp_str, sizeof(temp_str), "%02u", snprintf(temp_str, sizeof(temp_str), "%02u",
(unsigned)value->type.Time.hundredths); (unsigned)value->type.Time.hundredths);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} }
/* If we get here, then everything is OK. Indicate how many */ /* If we get here, then everything is OK. Indicate how many */
/* bytes were written. */ /* bytes were written. */
@@ -1300,42 +1321,52 @@ int bacapp_snprintf_value(
#endif #endif
#if defined(BACAPP_OBJECT_ID) #if defined(BACAPP_OBJECT_ID)
case BACNET_APPLICATION_TAG_OBJECT_ID: case BACNET_APPLICATION_TAG_OBJECT_ID:
if (!append_str(&p_str, &rem_str_len, "(")) if (!append_str(&p_str, &rem_str_len, "(")) {
break; break;
}
if (value->type.Object_Id.type < MAX_ASHRAE_OBJECT_TYPE) { if (value->type.Object_Id.type < MAX_ASHRAE_OBJECT_TYPE) {
if (!append_str(&p_str, &rem_str_len, if (!append_str(&p_str, &rem_str_len,
bactext_object_type_name( bactext_object_type_name(
value->type.Object_Id.type))) value->type.Object_Id.type))) {
break; break;
}
snprintf(temp_str, sizeof(temp_str), ", %lu", snprintf(temp_str, sizeof(temp_str), ", %lu",
(unsigned long)value->type.Object_Id.instance); (unsigned long)value->type.Object_Id.instance);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} else if (value->type.Object_Id.type < 128) { } else if (value->type.Object_Id.type < 128) {
if (!append_str(&p_str, &rem_str_len, "reserved ")) if (!append_str(&p_str, &rem_str_len, "reserved ")) {
break; break;
}
snprintf(temp_str, sizeof(temp_str), "%u, ", snprintf(temp_str, sizeof(temp_str), "%u, ",
(unsigned)value->type.Object_Id.type); (unsigned)value->type.Object_Id.type);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
snprintf(temp_str, sizeof(temp_str), "%lu", snprintf(temp_str, sizeof(temp_str), "%lu",
(unsigned long)value->type.Object_Id.instance); (unsigned long)value->type.Object_Id.instance);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} else { } else {
if (!append_str(&p_str, &rem_str_len, "proprietary ")) if (!append_str(&p_str, &rem_str_len, "proprietary ")) {
break; break;
}
snprintf(temp_str, sizeof(temp_str), "%u, ", snprintf(temp_str, sizeof(temp_str), "%u, ",
(unsigned)value->type.Object_Id.type); (unsigned)value->type.Object_Id.type);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
snprintf(temp_str, sizeof(temp_str), "%lu", snprintf(temp_str, sizeof(temp_str), "%lu",
(unsigned long)value->type.Object_Id.instance); (unsigned long)value->type.Object_Id.instance);
if (!append_str(&p_str, &rem_str_len, temp_str)) if (!append_str(&p_str, &rem_str_len, temp_str)) {
break; break;
}
} }
if (!append_str(&p_str, &rem_str_len, ")")) if (!append_str(&p_str, &rem_str_len, ")")) {
break; break;
}
/* If we get here, then everything is OK. Indicate how many */ /* If we get here, then everything is OK. Indicate how many */
/* bytes were written. */ /* bytes were written. */
ret_val = str_len - rem_str_len; ret_val = str_len - rem_str_len;
@@ -1343,16 +1374,18 @@ int bacapp_snprintf_value(
#endif #endif
#if defined(BACAPP_LIGHTING_COMMAND) #if defined(BACAPP_LIGHTING_COMMAND)
case BACNET_APPLICATION_TAG_LIGHTING_COMMAND: case BACNET_APPLICATION_TAG_LIGHTING_COMMAND:
if (!append_str(&p_str, &rem_str_len, "(")) if (!append_str(&p_str, &rem_str_len, "(")) {
break; break;
}
if (!append_str(&p_str, &rem_str_len, if (!append_str(&p_str, &rem_str_len,
bactext_lighting_operation_name( bactext_lighting_operation_name(
value->type.Lighting_Command.operation))) { value->type.Lighting_Command.operation))) {
break; break;
} }
/* FIXME: add the Lighting Command optional values */ /* FIXME: add the Lighting Command optional values */
if (!append_str(&p_str, &rem_str_len, ")")) if (!append_str(&p_str, &rem_str_len, ")")) {
break; break;
}
/* If we get here, then everything is OK. Indicate how many */ /* If we get here, then everything is OK. Indicate how many */
/* bytes were written. */ /* bytes were written. */
ret_val = str_len - rem_str_len; ret_val = str_len - rem_str_len;
src/bacnet/basic/object/acc.c
+10 -5
View File
@@ -67,12 +67,15 @@ static const int Properties_Proprietary[] = { -1 };
void Accumulator_Property_Lists( void Accumulator_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary) const int **pRequired, const int **pOptional, const int **pProprietary)
{ {
if (pRequired) if (pRequired) {
*pRequired = Properties_Required; *pRequired = Properties_Required;
if (pOptional) }
if (pOptional) {
*pOptional = Properties_Optional; *pOptional = Properties_Optional;
if (pProprietary) }
if (pProprietary) {
*pProprietary = Properties_Proprietary; *pProprietary = Properties_Proprietary;
}
return; return;
} }
@@ -86,8 +89,9 @@ void Accumulator_Property_Lists(
*/ */
bool Accumulator_Valid_Instance(uint32_t object_instance) bool Accumulator_Valid_Instance(uint32_t object_instance)
{ {
if (object_instance < MAX_ACCUMULATORS) if (object_instance < MAX_ACCUMULATORS) {
return true; return true;
}
return false; return false;
} }
@@ -128,8 +132,9 @@ unsigned Accumulator_Instance_To_Index(uint32_t object_instance)
{ {
unsigned index = MAX_ACCUMULATORS; unsigned index = MAX_ACCUMULATORS;
if (object_instance < MAX_ACCUMULATORS) if (object_instance < MAX_ACCUMULATORS) {
index = object_instance; index = object_instance;
}
return index; return index;
} }