projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update snapshot(2018-01-24)
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
stack
/
src
/
ocstack.c
diff --git
a/resource/csdk/stack/src/ocstack.c
b/resource/csdk/stack/src/ocstack.c
index
8e7253f
..
3051ad9
100644
(file)
--- a/
resource/csdk/stack/src/ocstack.c
+++ b/
resource/csdk/stack/src/ocstack.c
@@
-2527,7
+2527,7
@@
OCStackResult OCInit2(OCMode mode, OCTransportFlags serverFlags, OCTransportFlag
}
#endif
}
#endif
- InitializeObseverList();
+ InitializeObse
r
verList();
exit:
if(result != OC_STACK_OK)
exit:
if(result != OC_STACK_OK)
@@
-2585,7
+2585,7
@@
OCStackResult OCStop()
TerminateScheduleResourceList();
// Remove all observers
TerminateScheduleResourceList();
// Remove all observers
-
Termina
teObserverList();
+
Dele
teObserverList();
// Free memory dynamically allocated for resources
deleteAllResources();
// Remove all the client callbacks
// Free memory dynamically allocated for resources
deleteAllResources();
// Remove all the client callbacks
@@
-2597,6
+2597,9
@@
OCStackResult OCStop()
// TODO after BeachHead delivery: consolidate into single SRMDeInit()
SRMDeInitPolicyEngine();
// TODO after BeachHead delivery: consolidate into single SRMDeInit()
SRMDeInitPolicyEngine();
+ // Destroy Observer List Mutex
+ TerminateObserverList();
+
stackState = OC_STACK_UNINITIALIZED;
return OC_STACK_OK;
}
stackState = OC_STACK_UNINITIALIZED;
return OC_STACK_OK;
}
@@
-5333,7
+5336,7
@@
OCStackResult OCGetResourceIns(OCResourceHandle handle, int64_t *ins)
#endif
OCStackResult OCSetHeaderOption(OCHeaderOption* ocHdrOpt, size_t* numOptions, uint16_t optionID,
#endif
OCStackResult OCSetHeaderOption(OCHeaderOption* ocHdrOpt, size_t* numOptions, uint16_t optionID,
- void* optionData, size_t optionDataLength)
+
const
void* optionData, size_t optionDataLength)
{
if (!ocHdrOpt)
{
{
if (!ocHdrOpt)
{