[vlc-devel] commit: libvlc_log: remove useless exception parameters ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sun Aug 9 17:37:43 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug 9 18:34:59 2009 +0300| [d1578edccca15a11b20be4ad946a705ee0feceaf] | committer: Rémi Denis-Courmont
libvlc_log: remove useless exception parameters
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d1578edccca15a11b20be4ad946a705ee0feceaf
---
include/vlc/libvlc.h | 36 ++++++++++++++----------------------
src/control/log.c | 21 ++++++++++-----------
2 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 431b801..4f27ad9 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -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.
*
* \param p_instance libvlc instance
- * \param p_e an initialized exception pointer
* \return verbosity level for messages
*/
-VLC_PUBLIC_API unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance,
- libvlc_exception_t *p_e );
+VLC_PUBLIC_API unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance );
/**
* Set the VLC messaging verbosity level.
*
* \param p_instance libvlc log instance
* \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,
- libvlc_exception_t *p_e );
+VLC_PUBLIC_API void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level );
/**
* Open a VLC message log instance.
@@ -337,19 +333,18 @@ VLC_PUBLIC_API libvlc_log_t *libvlc_log_open( libvlc_instance_t *, libvlc_except
/**
* Close a VLC message log instance.
*
- * \param p_log libvlc log instance
- * \param p_e an initialized exception pointer
+ * \param p_log libvlc log instance or NULL
*/
-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.
*
- * \param p_log libvlc log instance
+ * \param p_log libvlc log instance or NULL
* \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.
@@ -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
* regular basis to avoid clogging.
*
- * \param p_log libvlc log instance
- * \param p_e an initialized exception pointer
+ * \param p_log libvlc log instance or NULL
*/
-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.
@@ -374,26 +368,24 @@ VLC_PUBLIC_API libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_
/**
* Release a previoulsy allocated iterator.
*
- * \param p_iter libvlc log iterator
- * \param p_e an initialized exception pointer
+ * \param p_iter libvlc log iterator or NULL
*/
-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.
*
- * \param p_iter libvlc log iterator
- * \param p_e an initialized exception pointer
+ * \param p_iter libvlc log iterator or NULL
* \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.
*
* 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_e an initialized exception pointer
* \return log message object
diff --git a/src/control/log.c b/src/control/log.c
index 20a8983..a45bf72 100644
--- a/src/control/log.c
+++ b/src/control/log.c
@@ -73,17 +73,15 @@ struct libvlc_log_iterator_t
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 );
- (void)p_e;
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 );
- (void)p_e;
p_instance->verbosity = level;
}
@@ -110,7 +108,7 @@ libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance, libvlc_exception_t
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 )
return;
@@ -118,12 +116,12 @@ void libvlc_log_close( libvlc_log_t *p_log, libvlc_exception_t *p_e )
assert( p_log->p_messages );
msg_Unsubscribe(p_log->p_messages);
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 );
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 )
return 0;
@@ -139,7 +137,7 @@ unsigned libvlc_log_count( const libvlc_log_t *p_log, libvlc_exception_t *p_e )
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 )
return;
@@ -154,7 +152,8 @@ void libvlc_log_clear( libvlc_log_t *p_log, libvlc_exception_t *p_e )
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 )
{
@@ -176,12 +175,12 @@ libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log, libvl
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 );
}
-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 )
return 0;
More information about the vlc-devel
mailing list