Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iotivity-lite
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
31
Issues
31
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
IoTivity
iotivity-lite
Commits
89a79af8
Commit
89a79af8
authored
Apr 23, 2020
by
Kishen Maloor
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'origin/master' into fargo
Signed-off-by:
Kishen Maloor
<
kishen.maloor@intel.com
>
parents
8bd6c0c0
7c50703a
Pipeline
#724
passed with stage
in 12 minutes and 12 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
security/oc_obt.c
security/oc_obt.c
+6
-4
No files found.
.gitlab-ci.yml
View file @
89a79af8
---
image
:
gcc
image
:
gcc
:9.3.0
Linux_Secured_Test
:
variables
:
...
...
security/oc_obt.c
View file @
89a79af8
...
...
@@ -375,8 +375,10 @@ static oc_event_callback_retval_t
free_discovery_cb
(
void
*
data
)
{
oc_discovery_cb_t
*
c
=
(
oc_discovery_cb_t
*
)
data
;
oc_list_remove
(
oc_discovery_cbs
,
c
);
oc_memb_free
(
&
oc_discovery_s
,
c
);
if
(
is_item_in_list
(
oc_discovery_cbs
,
c
))
{
oc_list_remove
(
oc_discovery_cbs
,
c
);
oc_memb_free
(
&
oc_discovery_s
,
c
);
}
return
OC_EVENT_DONE
;
}
...
...
@@ -2699,10 +2701,10 @@ oc_obt_shutdown(void)
oc_memb_free
(
&
oc_devices_s
,
device
);
device
=
(
oc_device_t
*
)
oc_list_pop
(
oc_devices
);
}
oc_discovery_cb_t
*
cb
=
(
oc_discovery_cb_t
*
)
oc_list_
pop
(
oc_discovery_cbs
);
oc_discovery_cb_t
*
cb
=
(
oc_discovery_cb_t
*
)
oc_list_
head
(
oc_discovery_cbs
);
while
(
cb
)
{
free_discovery_cb
(
cb
);
cb
=
(
oc_discovery_cb_t
*
)
oc_list_
pop
(
oc_discovery_cbs
);
cb
=
(
oc_discovery_cb_t
*
)
oc_list_
head
(
oc_discovery_cbs
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment