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
d1578edc
Commit
d1578edc
authored
Aug 09, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc_log: remove useless exception parameters
parent
ef92eb2f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
33 deletions
+24
-33
include/vlc/libvlc.h
include/vlc/libvlc.h
+14
-22
src/control/log.c
src/control/log.c
+10
-11
No files found.
include/vlc/libvlc.h
View file @
d1578edc
...
@@ -309,21 +309,17 @@ VLC_PUBLIC_API const char * libvlc_event_type_name( libvlc_event_type_t event_ty
...
@@ -309,21 +309,17 @@ VLC_PUBLIC_API const char * libvlc_event_type_name( libvlc_event_type_t event_ty
* Return the VLC messaging verbosity level.
* Return the VLC messaging verbosity level.
*
*
* \param p_instance libvlc instance
* \param p_instance libvlc instance
* \param p_e an initialized exception pointer
* \return verbosity level for messages
* \return verbosity level for messages
*/
*/
VLC_PUBLIC_API
unsigned
libvlc_get_log_verbosity
(
const
libvlc_instance_t
*
p_instance
,
VLC_PUBLIC_API
unsigned
libvlc_get_log_verbosity
(
const
libvlc_instance_t
*
p_instance
);
libvlc_exception_t
*
p_e
);
/**
/**
* Set the VLC messaging verbosity level.
* Set the VLC messaging verbosity level.
*
*
* \param p_instance libvlc log instance
* \param p_instance libvlc log instance
* \param level log level
* \param level log level
* \param p_e an initialized exception pointer
*/
*/
VLC_PUBLIC_API
void
libvlc_set_log_verbosity
(
libvlc_instance_t
*
p_instance
,
unsigned
level
,
VLC_PUBLIC_API
void
libvlc_set_log_verbosity
(
libvlc_instance_t
*
p_instance
,
unsigned
level
);
libvlc_exception_t
*
p_e
);
/**
/**
* Open a VLC message log instance.
* Open a VLC message log instance.
...
@@ -337,19 +333,18 @@ VLC_PUBLIC_API libvlc_log_t *libvlc_log_open( libvlc_instance_t *, libvlc_except
...
@@ -337,19 +333,18 @@ VLC_PUBLIC_API libvlc_log_t *libvlc_log_open( libvlc_instance_t *, libvlc_except
/**
/**
* Close a VLC message log instance.
* Close a VLC message log instance.
*
*
* \param p_log libvlc log instance
* \param p_log libvlc log instance or NULL
* \param p_e an initialized exception pointer
*/
*/
VLC_PUBLIC_API
void
libvlc_log_close
(
libvlc_log_t
*
,
libvlc_exception_t
*
);
VLC_PUBLIC_API
void
libvlc_log_close
(
libvlc_log_t
*
p_log
);
/**
/**
* Returns the number of messages in a log instance.
* Returns the number of messages in a log instance.
*
*
* \param p_log libvlc log instance
* \param p_log libvlc log instance
or NULL
* \param p_e an initialized exception pointer
* \param p_e an initialized exception pointer
* \return number of log messages
* \return number of log messages
, 0 if p_log is NULL
*/
*/
VLC_PUBLIC_API
unsigned
libvlc_log_count
(
const
libvlc_log_t
*
,
libvlc_exception_t
*
);
VLC_PUBLIC_API
unsigned
libvlc_log_count
(
const
libvlc_log_t
*
p_log
);
/**
/**
* Clear a log instance.
* Clear a log instance.
...
@@ -357,10 +352,9 @@ VLC_PUBLIC_API unsigned libvlc_log_count( const libvlc_log_t *, libvlc_exception
...
@@ -357,10 +352,9 @@ VLC_PUBLIC_API unsigned libvlc_log_count( const libvlc_log_t *, libvlc_exception
* All messages in the log are removed. The log should be cleared on a
* All messages in the log are removed. The log should be cleared on a
* regular basis to avoid clogging.
* regular basis to avoid clogging.
*
*
* \param p_log libvlc log instance
* \param p_log libvlc log instance or NULL
* \param p_e an initialized exception pointer
*/
*/
VLC_PUBLIC_API
void
libvlc_log_clear
(
libvlc_log_t
*
,
libvlc_exception_t
*
);
VLC_PUBLIC_API
void
libvlc_log_clear
(
libvlc_log_t
*
p_log
);
/**
/**
* Allocate and returns a new iterator to messages in log.
* Allocate and returns a new iterator to messages in log.
...
@@ -374,26 +368,24 @@ VLC_PUBLIC_API libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_
...
@@ -374,26 +368,24 @@ VLC_PUBLIC_API libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_
/**
/**
* Release a previoulsy allocated iterator.
* Release a previoulsy allocated iterator.
*
*
* \param p_iter libvlc log iterator
* \param p_iter libvlc log iterator or NULL
* \param p_e an initialized exception pointer
*/
*/
VLC_PUBLIC_API
void
libvlc_log_iterator_free
(
libvlc_log_iterator_t
*
p_iter
,
libvlc_exception_t
*
p_e
);
VLC_PUBLIC_API
void
libvlc_log_iterator_free
(
libvlc_log_iterator_t
*
p_iter
);
/**
/**
* Return whether log iterator has more messages.
* Return whether log iterator has more messages.
*
*
* \param p_iter libvlc log iterator
* \param p_iter libvlc log iterator or NULL
* \param p_e an initialized exception pointer
* \return true if iterator has more message objects, else false
* \return true if iterator has more message objects, else false
*/
*/
VLC_PUBLIC_API
int
libvlc_log_iterator_has_next
(
const
libvlc_log_iterator_t
*
p_iter
,
libvlc_exception_t
*
p_e
);
VLC_PUBLIC_API
int
libvlc_log_iterator_has_next
(
const
libvlc_log_iterator_t
*
p_iter
);
/**
/**
* Return the next log message.
* Return the next log message.
*
*
* The message contents must not be freed
* The message contents must not be freed
*
*
* \param p_iter libvlc log iterator
* \param p_iter libvlc log iterator
or NULL
* \param p_buffer log buffer
* \param p_buffer log buffer
* \param p_e an initialized exception pointer
* \param p_e an initialized exception pointer
* \return log message object
* \return log message object
...
...
src/control/log.c
View file @
d1578edc
...
@@ -73,17 +73,15 @@ struct libvlc_log_iterator_t
...
@@ -73,17 +73,15 @@ struct libvlc_log_iterator_t
unsigned
i_end
;
unsigned
i_end
;
};
};
unsigned
libvlc_get_log_verbosity
(
const
libvlc_instance_t
*
p_instance
,
libvlc_exception_t
*
p_e
)
unsigned
libvlc_get_log_verbosity
(
const
libvlc_instance_t
*
p_instance
)
{
{
assert
(
p_instance
);
assert
(
p_instance
);
(
void
)
p_e
;
return
p_instance
->
verbosity
;
return
p_instance
->
verbosity
;
}
}
void
libvlc_set_log_verbosity
(
libvlc_instance_t
*
p_instance
,
unsigned
level
,
libvlc_exception_t
*
p_e
)
void
libvlc_set_log_verbosity
(
libvlc_instance_t
*
p_instance
,
unsigned
level
)
{
{
assert
(
p_instance
);
assert
(
p_instance
);
(
void
)
p_e
;
p_instance
->
verbosity
=
level
;
p_instance
->
verbosity
=
level
;
}
}
...
@@ -110,7 +108,7 @@ libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance, libvlc_exception_t
...
@@ -110,7 +108,7 @@ libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance, libvlc_exception_t
return
p_log
;
return
p_log
;
}
}
void
libvlc_log_close
(
libvlc_log_t
*
p_log
,
libvlc_exception_t
*
p_e
)
void
libvlc_log_close
(
libvlc_log_t
*
p_log
)
{
{
if
(
!
p_log
)
if
(
!
p_log
)
return
;
return
;
...
@@ -118,12 +116,12 @@ void libvlc_log_close( libvlc_log_t *p_log, libvlc_exception_t *p_e )
...
@@ -118,12 +116,12 @@ void libvlc_log_close( libvlc_log_t *p_log, libvlc_exception_t *p_e )
assert
(
p_log
->
p_messages
);
assert
(
p_log
->
p_messages
);
msg_Unsubscribe
(
p_log
->
p_messages
);
msg_Unsubscribe
(
p_log
->
p_messages
);
libvlc_release
(
p_log
->
p_instance
);
libvlc_release
(
p_log
->
p_instance
);
libvlc_log_clear
(
p_log
,
p_e
);
libvlc_log_clear
(
p_log
);
vlc_spin_destroy
(
&
p_log
->
data
.
lock
);
vlc_spin_destroy
(
&
p_log
->
data
.
lock
);
free
(
p_log
);
free
(
p_log
);
}
}
unsigned
libvlc_log_count
(
const
libvlc_log_t
*
p_log
,
libvlc_exception_t
*
p_e
)
unsigned
libvlc_log_count
(
const
libvlc_log_t
*
p_log
)
{
{
if
(
!
p_log
)
if
(
!
p_log
)
return
0
;
return
0
;
...
@@ -139,7 +137,7 @@ unsigned libvlc_log_count( const libvlc_log_t *p_log, libvlc_exception_t *p_e )
...
@@ -139,7 +137,7 @@ unsigned libvlc_log_count( const libvlc_log_t *p_log, libvlc_exception_t *p_e )
return
ret
;
return
ret
;
}
}
void
libvlc_log_clear
(
libvlc_log_t
*
p_log
,
libvlc_exception_t
*
p_e
)
void
libvlc_log_clear
(
libvlc_log_t
*
p_log
)
{
{
if
(
!
p_log
)
if
(
!
p_log
)
return
;
return
;
...
@@ -154,7 +152,8 @@ void libvlc_log_clear( libvlc_log_t *p_log, libvlc_exception_t *p_e )
...
@@ -154,7 +152,8 @@ void libvlc_log_clear( libvlc_log_t *p_log, libvlc_exception_t *p_e )
msg_Release
(
tab
[
i
]);
msg_Release
(
tab
[
i
]);
}
}
libvlc_log_iterator_t
*
libvlc_log_get_iterator
(
const
libvlc_log_t
*
p_log
,
libvlc_exception_t
*
p_e
)
libvlc_log_iterator_t
*
libvlc_log_get_iterator
(
const
libvlc_log_t
*
p_log
,
libvlc_exception_t
*
p_e
)
{
{
if
(
p_log
)
if
(
p_log
)
{
{
...
@@ -176,12 +175,12 @@ libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log, libvl
...
@@ -176,12 +175,12 @@ libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log, libvl
RAISENULL
(
"Invalid log object!"
);
RAISENULL
(
"Invalid log object!"
);
}
}
void
libvlc_log_iterator_free
(
libvlc_log_iterator_t
*
p_iter
,
libvlc_exception_t
*
p_e
)
void
libvlc_log_iterator_free
(
libvlc_log_iterator_t
*
p_iter
)
{
{
free
(
p_iter
);
free
(
p_iter
);
}
}
int
libvlc_log_iterator_has_next
(
const
libvlc_log_iterator_t
*
p_iter
,
libvlc_exception_t
*
p_e
)
int
libvlc_log_iterator_has_next
(
const
libvlc_log_iterator_t
*
p_iter
)
{
{
if
(
!
p_iter
)
if
(
!
p_iter
)
return
0
;
return
0
;
...
...
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