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

Improved AtomicReadFile and AtomicWriteFile error detection. Eliminated redundancy in the octetstring_init function.

Browse Source
This commit is contained in:
skarg
2015-09-01 22:24:34 +00:00
parent 80b628453d
commit 458d563aaf
4 changed files with 120 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/bacstr.c
+12 -14
View File
@@ -696,25 +696,23 @@ bool octetstring_init(
bool status = false; /* return value */
size_t i; /* counter */
if (octet_string) {
if (octet_string && (length <= MAX_OCTET_STRING_BYTES)) {
octet_string->length = 0;
if (length <= MAX_OCTET_STRING_BYTES) {
if (value) {
for (i = 0; i < length; i++) {
if (i < length) {
octet_string->value[octet_string->length] = value[i];
octet_string->length++;
} else {
octet_string->value[i] = 0;
}
}
} else {
for (i = 0; i < MAX_OCTET_STRING_BYTES; i++) {
if (value) {
for (i = 0; i < MAX_OCTET_STRING_BYTES; i++) {
if (i < length) {
octet_string->value[i] = value[i];
} else {
octet_string->value[i] = 0;
}
}
status = true;
octet_string->length = length;
} else {
for (i = 0; i < MAX_OCTET_STRING_BYTES; i++) {
octet_string->value[i] = 0;
}
}
status = true;
}
return status;