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

Changed structure copy to explicit copy.

Browse Source
This commit is contained in:
skarg
2016-09-28 21:21:13 +00:00
parent a390c4b8bd
commit 8e573aed89
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/address.c
+7 -7
View File
@@ -457,7 +457,7 @@ bool address_get_by_device(
if (((pMatch->Flags & BAC_ADDR_IN_USE) != 0) && if (((pMatch->Flags & BAC_ADDR_IN_USE) != 0) &&
(pMatch->device_id == device_id)) { (pMatch->device_id == device_id)) {
if ((pMatch->Flags & BAC_ADDR_BIND_REQ) == 0) { /* If bound then fetch data */ if ((pMatch->Flags & BAC_ADDR_BIND_REQ) == 0) { /* If bound then fetch data */
*src = pMatch->address; bacnet_address_copy(src, &pMatch->address);
*max_apdu = pMatch->max_apdu; *max_apdu = pMatch->max_apdu;
found = true; /* Prove we found it */ found = true; /* Prove we found it */
} }
@@ -518,7 +518,7 @@ void address_add(
while (pMatch <= &Address_Cache[MAX_ADDRESS_CACHE - 1]) { while (pMatch <= &Address_Cache[MAX_ADDRESS_CACHE - 1]) {
if (((pMatch->Flags & BAC_ADDR_IN_USE) != 0) && if (((pMatch->Flags & BAC_ADDR_IN_USE) != 0) &&
(pMatch->device_id == device_id)) { (pMatch->device_id == device_id)) {
pMatch->address = *src; bacnet_address_copy(&pMatch->address, src);
pMatch->max_apdu = max_apdu; pMatch->max_apdu = max_apdu;
/* Pick the right time to live */ /* Pick the right time to live */
@@ -547,7 +547,7 @@ void address_add(
pMatch->Flags = BAC_ADDR_IN_USE; pMatch->Flags = BAC_ADDR_IN_USE;
pMatch->device_id = device_id; pMatch->device_id = device_id;
pMatch->max_apdu = max_apdu; pMatch->max_apdu = max_apdu;
pMatch->address = *src; bacnet_address_copy(&pMatch->address, src);
pMatch->TimeToLive = BAC_ADDR_SHORT_TIME; /* Opportunistic entry so leave on short fuse */ pMatch->TimeToLive = BAC_ADDR_SHORT_TIME; /* Opportunistic entry so leave on short fuse */
found = true; found = true;
break; break;
@@ -563,7 +563,7 @@ void address_add(
pMatch->Flags = BAC_ADDR_IN_USE; pMatch->Flags = BAC_ADDR_IN_USE;
pMatch->device_id = device_id; pMatch->device_id = device_id;
pMatch->max_apdu = max_apdu; pMatch->max_apdu = max_apdu;
pMatch->address = *src; bacnet_address_copy(&pMatch->address, src);
pMatch->TimeToLive = BAC_ADDR_SHORT_TIME; /* Opportunistic entry so leave on short fuse */ pMatch->TimeToLive = BAC_ADDR_SHORT_TIME; /* Opportunistic entry so leave on short fuse */
} }
} }
@@ -589,7 +589,7 @@ bool address_device_bind_request(
if ((pMatch->Flags & BAC_ADDR_BIND_REQ) == 0) { /* Already bound */ if ((pMatch->Flags & BAC_ADDR_BIND_REQ) == 0) { /* Already bound */
found = true; found = true;
if (src) { if (src) {
*src = pMatch->address; bacnet_address_copy(src, &pMatch->address);
} }
if (max_apdu) { if (max_apdu) {
*max_apdu = pMatch->max_apdu; *max_apdu = pMatch->max_apdu;
@@ -655,7 +655,7 @@ void address_add_binding(
while (pMatch <= &Address_Cache[MAX_ADDRESS_CACHE - 1]) { while (pMatch <= &Address_Cache[MAX_ADDRESS_CACHE - 1]) {
if (((pMatch->Flags & BAC_ADDR_IN_USE) != 0) && if (((pMatch->Flags & BAC_ADDR_IN_USE) != 0) &&
(pMatch->device_id == device_id)) { (pMatch->device_id == device_id)) {
pMatch->address = *src; bacnet_address_copy(&pMatch->address, src);
pMatch->max_apdu = max_apdu; pMatch->max_apdu = max_apdu;
/* Clear bind request flag in case it was set */ /* Clear bind request flag in case it was set */
pMatch->Flags &= ~BAC_ADDR_BIND_REQ; pMatch->Flags &= ~BAC_ADDR_BIND_REQ;
@@ -686,7 +686,7 @@ bool address_device_get_by_index(
if ((pMatch->Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ)) == if ((pMatch->Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ)) ==
BAC_ADDR_IN_USE) { BAC_ADDR_IN_USE) {
if (src) { if (src) {
*src = pMatch->address; bacnet_address_copy(src, &pMatch->address);
} }
if (device_id) { if (device_id) {
*device_id = pMatch->device_id; *device_id = pMatch->device_id;