Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
cpp-libs
libnice
Commits
9057acc5
Commit
9057acc5
authored
Apr 22, 2014
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
discovery: Use g_slist_free_full for discovery list
parent
3a90ff40
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
10 deletions
+5
-10
agent/discovery.c
agent/discovery.c
+5
-9
agent/discovery.h
agent/discovery.h
+0
-1
No files found.
agent/discovery.c
View file @
9057acc5
...
@@ -70,13 +70,10 @@ static inline int priv_timer_expired (GTimeVal *timer, GTimeVal *now)
...
@@ -70,13 +70,10 @@ static inline int priv_timer_expired (GTimeVal *timer, GTimeVal *now)
/*
/*
* Frees the CandidateDiscovery structure pointed to
* Frees the CandidateDiscovery structure pointed to
* by 'user data'. Compatible with g_slist_f
oreach
().
* by 'user data'. Compatible with g_slist_f
ree_full
().
*/
*/
void
discovery_free_item
(
gpointer
data
,
gpointer
user_data
)
static
void
discovery_free_item
(
CandidateDiscovery
*
cand
)
{
{
CandidateDiscovery
*
cand
=
data
;
g_assert
(
user_data
==
NULL
);
g_slice_free
(
CandidateDiscovery
,
cand
);
g_slice_free
(
CandidateDiscovery
,
cand
);
}
}
...
@@ -85,9 +82,8 @@ void discovery_free_item (gpointer data, gpointer user_data)
...
@@ -85,9 +82,8 @@ void discovery_free_item (gpointer data, gpointer user_data)
*/
*/
void
discovery_free
(
NiceAgent
*
agent
)
void
discovery_free
(
NiceAgent
*
agent
)
{
{
g_slist_free_full
(
agent
->
discovery_list
,
g_slist_foreach
(
agent
->
discovery_list
,
discovery_free_item
,
NULL
);
(
GDestroyNotify
)
discovery_free_item
);
g_slist_free
(
agent
->
discovery_list
);
agent
->
discovery_list
=
NULL
;
agent
->
discovery_list
=
NULL
;
agent
->
discovery_unsched_items
=
0
;
agent
->
discovery_unsched_items
=
0
;
...
@@ -114,7 +110,7 @@ void discovery_prune_stream (NiceAgent *agent, guint stream_id)
...
@@ -114,7 +110,7 @@ void discovery_prune_stream (NiceAgent *agent, guint stream_id)
if
(
cand
->
stream
->
id
==
stream_id
)
{
if
(
cand
->
stream
->
id
==
stream_id
)
{
agent
->
discovery_list
=
g_slist_remove
(
agent
->
discovery_list
,
cand
);
agent
->
discovery_list
=
g_slist_remove
(
agent
->
discovery_list
,
cand
);
discovery_free_item
(
cand
,
NULL
);
discovery_free_item
(
cand
);
}
}
i
=
next
;
i
=
next
;
}
}
...
...
agent/discovery.h
View file @
9057acc5
...
@@ -88,7 +88,6 @@ void refresh_prune_stream (NiceAgent *agent, guint stream_id);
...
@@ -88,7 +88,6 @@ void refresh_prune_stream (NiceAgent *agent, guint stream_id);
void
refresh_cancel
(
CandidateRefresh
*
refresh
);
void
refresh_cancel
(
CandidateRefresh
*
refresh
);
void
discovery_free_item
(
gpointer
data
,
gpointer
user_data
);
void
discovery_free
(
NiceAgent
*
agent
);
void
discovery_free
(
NiceAgent
*
agent
);
void
discovery_prune_stream
(
NiceAgent
*
agent
,
guint
stream_id
);
void
discovery_prune_stream
(
NiceAgent
*
agent
,
guint
stream_id
);
void
discovery_schedule
(
NiceAgent
*
agent
);
void
discovery_schedule
(
NiceAgent
*
agent
);
...
...
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