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

Corrected compiler warnings.

Browse Source
This commit is contained in:
skarg
2011-12-20 15:39:30 +00:00
parent cb620a9432
commit 7d87b88d47
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/bacapp.c
+26 -15
View File
@@ -940,10 +940,10 @@ int bacapp_data_len(
static bool append_str(char **str, size_t *rem_str_len, const char *add_str) static bool append_str(char **str, size_t *rem_str_len, const char *add_str)
{ {
bool retval; bool retval;
int bytes_written = snprintf(*str, *rem_str_len, add_str); int bytes_written;
if ( (bytes_written < 0) || (bytes_written >= *rem_str_len) ) bytes_written = snprintf(*str, *rem_str_len, "%s", add_str);
{ if ( (bytes_written < 0) || (bytes_written >= *rem_str_len) ) {
/* If there was an error or output was truncated, return error */ /* If there was an error or output was truncated, return error */
retval = false; retval = false;
} }
@@ -1164,7 +1164,8 @@ int bacapp_snprintf_value(
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, ", (unsigned) value->type.Date.day); snprintf(temp_str, sizeof(temp_str), " %u, ",
(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;
} }
@@ -1172,7 +1173,8 @@ int bacapp_snprintf_value(
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, "%u", sizeof(temp_str), (unsigned) value->type.Date.year); snprintf(temp_str, sizeof(temp_str), "%u",
(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;
} }
@@ -1185,7 +1187,8 @@ int bacapp_snprintf_value(
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:", (unsigned) value->type.Time.hour); snprintf(temp_str, sizeof(temp_str), "%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;
} }
@@ -1193,7 +1196,8 @@ int bacapp_snprintf_value(
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:", (unsigned) value->type.Time.min); snprintf(temp_str, sizeof(temp_str), "%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;
} }
@@ -1201,7 +1205,8 @@ int bacapp_snprintf_value(
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.", (unsigned) value->type.Time.sec); snprintf(temp_str, sizeof(temp_str), "%02u.",
(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;
} }
@@ -1209,7 +1214,8 @@ int bacapp_snprintf_value(
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", (unsigned) value->type.Time.hundredths); snprintf(temp_str, sizeof(temp_str), "%02u",
(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;
} }
@@ -1222,29 +1228,34 @@ int bacapp_snprintf_value(
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(value->type.Object_Id.type) bactext_object_type_name(value->type.Object_Id.type)
) )
) )
break; break;
snprintf(temp_str, sizeof(temp_str), ", %lu", (unsigned long) value->type.Object_Id.instance); snprintf(temp_str, sizeof(temp_str), ", %lu",
(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, ", (unsigned) value->type.Object_Id.type); snprintf(temp_str, sizeof(temp_str), "%u, ",
(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", (unsigned long) value->type.Object_Id.instance); snprintf(temp_str, sizeof(temp_str), "%lu",
(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, ", (unsigned) value->type.Object_Id.type); snprintf(temp_str, sizeof(temp_str), "%u, ",
(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", (unsigned long) value->type.Object_Id.instance); snprintf(temp_str, sizeof(temp_str), "%lu",
(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;
} }