*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
*
- * $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
+ * $Id$
*
* Authors: Damien Fouilleul <damienf@videolan.org>
*
if( p_log && p_log->p_messages )
{
msg_Unsubscribe(p_log->p_instance->p_libvlc_int, p_log->p_messages);
- libvlc_release( p_log->p_instance, p_e );
+ libvlc_release( p_log->p_instance );
free(p_log);
}
else
}
libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
- struct libvlc_log_message_t *buffer,
+ libvlc_log_message_t *buffer,
libvlc_exception_t *p_e )
{
- if( p_iter )
- {
- if( buffer && (sizeof(struct libvlc_log_message_t) == buffer->sizeof_msg) )
- {
- int i_pos = p_iter->i_pos;
- if( i_pos != p_iter->i_end )
- {
- msg_item_t *msg;
- vlc_mutex_lock(p_iter->p_messages->p_lock);
- msg = p_iter->p_messages->p_msg+i_pos;
- buffer->i_severity = msg->i_type;
- buffer->psz_type = msg_GetObjectTypeName(msg->i_object_type);
- buffer->psz_name = msg->psz_module;
- buffer->psz_header = msg->psz_header;
- buffer->psz_message = msg->psz_msg;
- p_iter->i_pos = ++i_pos % VLC_MSG_QSIZE;
- vlc_mutex_unlock(p_iter->p_messages->p_lock);
-
- return buffer;
- }
- RAISENULL("No more messages");
- }
+ int i_pos;
+
+ if( !p_iter )
+ RAISENULL("Invalid log iterator!");
+ if( !buffer )
RAISENULL("Invalid message buffer!");
+
+ i_pos = p_iter->i_pos;
+ if( i_pos != p_iter->i_end )
+ {
+ msg_item_t *msg;
+ vlc_mutex_lock(p_iter->p_messages->p_lock);
+ msg = p_iter->p_messages->p_msg+i_pos;
+ buffer->i_severity = msg->i_type;
+ buffer->psz_type = msg->psz_object_type;
+ buffer->psz_name = msg->psz_module;
+ buffer->psz_header = msg->psz_header;
+ buffer->psz_message = msg->psz_msg;
+ p_iter->i_pos = ++i_pos % VLC_MSG_QSIZE;
+ vlc_mutex_unlock(p_iter->p_messages->p_lock);
+
+ return buffer;
}
- RAISENULL("Invalid log iterator!");
+ RAISENULL("No more messages");
}