Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
videolan
vlc
Commits
32376dc2
Commit
32376dc2
authored
Mar 11, 2008
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless test before a free.
if( bla ) free( bla ); => free( bla );
parent
da686e46
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
23 deletions
+17
-23
include/vlc_arrays.h
include/vlc_arrays.h
+1
-1
include/vlc_input.h
include/vlc_input.h
+12
-18
include/vlc_meta.h
include/vlc_meta.h
+2
-2
include/vlc_url.h
include/vlc_url.h
+2
-2
No files found.
include/vlc_arrays.h
View file @
32376dc2
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
#define TAB_CLEAN( count, tab ) \
#define TAB_CLEAN( count, tab ) \
do { \
do { \
if( tab ) free( tab );
\
free( tab );
\
(count)= 0; \
(count)= 0; \
(tab)= NULL; \
(tab)= NULL; \
} while(0)
} while(0)
...
...
include/vlc_input.h
View file @
32376dc2
...
@@ -121,7 +121,7 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent,
...
@@ -121,7 +121,7 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent,
static
inline
void
input_item_SetName
(
input_item_t
*
p_item
,
const
char
*
psz_name
)
static
inline
void
input_item_SetName
(
input_item_t
*
p_item
,
const
char
*
psz_name
)
{
{
if
(
p_item
->
psz_name
)
free
(
p_item
->
psz_name
);
free
(
p_item
->
psz_name
);
p_item
->
psz_name
=
strdup
(
psz_name
);
p_item
->
psz_name
=
strdup
(
psz_name
);
}
}
...
@@ -171,10 +171,7 @@ static inline void input_ItemClean( input_item_t *p_i )
...
@@ -171,10 +171,7 @@ static inline void input_ItemClean( input_item_t *p_i )
vlc_meta_Delete
(
p_i
->
p_meta
);
vlc_meta_Delete
(
p_i
->
p_meta
);
for
(
i
=
0
;
i
<
p_i
->
i_options
;
i
++
)
for
(
i
=
0
;
i
<
p_i
->
i_options
;
i
++
)
{
if
(
p_i
->
ppsz_options
[
i
]
)
free
(
p_i
->
ppsz_options
[
i
]
);
free
(
p_i
->
ppsz_options
[
i
]
);
}
TAB_CLEAN
(
p_i
->
i_options
,
p_i
->
ppsz_options
);
TAB_CLEAN
(
p_i
->
i_options
,
p_i
->
ppsz_options
);
for
(
i
=
0
;
i
<
p_i
->
i_es
;
i
++
)
for
(
i
=
0
;
i
<
p_i
->
i_es
;
i
++
)
...
@@ -193,15 +190,13 @@ static inline void input_ItemClean( input_item_t *p_i )
...
@@ -193,15 +190,13 @@ static inline void input_ItemClean( input_item_t *p_i )
{
{
struct
info_t
*
p_info
=
p_category
->
pp_infos
[
j
];
struct
info_t
*
p_info
=
p_category
->
pp_infos
[
j
];
if
(
p_info
->
psz_name
)
free
(
p_info
->
psz_name
);
free
(
p_info
->
psz_name
);
if
(
p_info
->
psz_value
)
free
(
p_info
->
psz_value
);
free
(
p_info
->
psz_value
);
free
(
p_info
);
free
(
p_info
);
}
}
TAB_CLEAN
(
p_category
->
i_infos
,
p_category
->
pp_infos
);
TAB_CLEAN
(
p_category
->
i_infos
,
p_category
->
pp_infos
);
if
(
p_category
->
psz_name
)
free
(
p_category
->
psz_name
);
free
(
p_category
->
psz_name
);
free
(
p_category
);
free
(
p_category
);
}
}
TAB_CLEAN
(
p_i
->
i_categories
,
p_i
->
pp_categories
);
TAB_CLEAN
(
p_i
->
i_categories
,
p_i
->
pp_categories
);
...
@@ -263,7 +258,7 @@ static inline char * input_item_GetURI( input_item_t * p_i )
...
@@ -263,7 +258,7 @@ static inline char * input_item_GetURI( input_item_t * p_i )
static
inline
void
input_item_SetURI
(
input_item_t
*
p_i
,
char
*
psz_uri
)
static
inline
void
input_item_SetURI
(
input_item_t
*
p_i
,
char
*
psz_uri
)
{
{
vlc_mutex_lock
(
&
p_i
->
lock
);
vlc_mutex_lock
(
&
p_i
->
lock
);
if
(
p_i
->
psz_uri
)
free
(
p_i
->
psz_uri
);
free
(
p_i
->
psz_uri
);
p_i
->
psz_uri
=
strdup
(
psz_uri
);
p_i
->
psz_uri
=
strdup
(
psz_uri
);
vlc_mutex_unlock
(
&
p_i
->
lock
);
vlc_mutex_unlock
(
&
p_i
->
lock
);
}
}
...
@@ -439,7 +434,7 @@ static inline seekpoint_t *vlc_seekpoint_New( void )
...
@@ -439,7 +434,7 @@ static inline seekpoint_t *vlc_seekpoint_New( void )
static
inline
void
vlc_seekpoint_Delete
(
seekpoint_t
*
point
)
static
inline
void
vlc_seekpoint_Delete
(
seekpoint_t
*
point
)
{
{
if
(
!
point
)
return
;
if
(
!
point
)
return
;
if
(
point
->
psz_name
)
free
(
point
->
psz_name
);
free
(
point
->
psz_name
);
free
(
point
);
free
(
point
);
}
}
...
@@ -490,13 +485,13 @@ static inline void vlc_input_title_Delete( input_title_t *t )
...
@@ -490,13 +485,13 @@ static inline void vlc_input_title_Delete( input_title_t *t )
if
(
t
==
NULL
)
if
(
t
==
NULL
)
return
;
return
;
if
(
t
->
psz_name
)
free
(
t
->
psz_name
);
free
(
t
->
psz_name
);
for
(
i
=
0
;
i
<
t
->
i_seekpoint
;
i
++
)
for
(
i
=
0
;
i
<
t
->
i_seekpoint
;
i
++
)
{
{
if
(
t
->
seekpoint
[
i
]
->
psz_name
)
free
(
t
->
seekpoint
[
i
]
->
psz_name
);
free
(
t
->
seekpoint
[
i
]
->
psz_name
);
free
(
t
->
seekpoint
[
i
]
);
free
(
t
->
seekpoint
[
i
]
);
}
}
if
(
t
->
seekpoint
)
free
(
t
->
seekpoint
);
free
(
t
->
seekpoint
);
free
(
t
);
free
(
t
);
}
}
...
@@ -570,7 +565,6 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
...
@@ -570,7 +565,6 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
free
(
a
->
psz_name
);
free
(
a
->
psz_name
);
free
(
a
->
psz_mime
);
free
(
a
->
psz_mime
);
free
(
a
->
psz_description
);
free
(
a
->
psz_description
);
if
(
a
->
p_data
)
free
(
a
->
p_data
);
free
(
a
->
p_data
);
free
(
a
);
free
(
a
);
}
}
...
...
include/vlc_meta.h
View file @
32376dc2
...
@@ -95,7 +95,7 @@ struct vlc_meta_t
...
@@ -95,7 +95,7 @@ struct vlc_meta_t
static
inline
void
vlc_meta_Set
(
vlc_meta_t
*
p_meta
,
vlc_meta_type_t
meta_type
,
const
char
*
psz_val
)
static
inline
void
vlc_meta_Set
(
vlc_meta_t
*
p_meta
,
vlc_meta_type_t
meta_type
,
const
char
*
psz_val
)
{
{
if
(
p_meta
->
ppsz_meta
[
meta_type
]
)
free
(
p_meta
->
ppsz_meta
[
meta_type
]
);
free
(
p_meta
->
ppsz_meta
[
meta_type
]
);
p_meta
->
ppsz_meta
[
meta_type
]
=
psz_val
?
strdup
(
psz_val
)
:
NULL
;
p_meta
->
ppsz_meta
[
meta_type
]
=
psz_val
?
strdup
(
psz_val
)
:
NULL
;
}
}
...
@@ -145,7 +145,7 @@ static inline void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
...
@@ -145,7 +145,7 @@ static inline void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
{
{
if
(
src
->
ppsz_meta
[
i
]
)
if
(
src
->
ppsz_meta
[
i
]
)
{
{
if
(
dst
->
ppsz_meta
[
i
]
)
free
(
dst
->
ppsz_meta
[
i
]
);
free
(
dst
->
ppsz_meta
[
i
]
);
dst
->
ppsz_meta
[
i
]
=
strdup
(
src
->
ppsz_meta
[
i
]
);
dst
->
ppsz_meta
[
i
]
=
strdup
(
src
->
ppsz_meta
[
i
]
);
}
}
}
}
...
...
include/vlc_url.h
View file @
32376dc2
...
@@ -182,8 +182,8 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
...
@@ -182,8 +182,8 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
*****************************************************************************/
*****************************************************************************/
static
inline
void
vlc_UrlClean
(
vlc_url_t
*
url
)
static
inline
void
vlc_UrlClean
(
vlc_url_t
*
url
)
{
{
if
(
url
->
psz_buffer
)
free
(
url
->
psz_buffer
);
free
(
url
->
psz_buffer
);
if
(
url
->
psz_host
)
free
(
url
->
psz_host
);
free
(
url
->
psz_host
);
url
->
psz_protocol
=
NULL
;
url
->
psz_protocol
=
NULL
;
url
->
psz_username
=
NULL
;
url
->
psz_username
=
NULL
;
...
...
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