* src/*: another bunch of .cvsignore files.

[vlc] / src / input / input_info.c

diff --git a/src/input/input_info.c b/src/input/input_info.c
index e587391889799d38444522bd6e23d38d7cb2a5b4..40ee191894d8be6c7923f58d6dd3b8e77b52559f 100644 (file)
--- a/src/input/input_info.c
+++ b/src/input/input_info.c
@@ -2,7 +2,7 @@
  * input_info.c: Convenient functions to handle the input info structures
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_info.c,v 1.1 2002/07/21 18:57:02 sigmunau Exp $
+ * $Id: input_info.c,v 1.5 2002/08/18 13:16:51 sigmunau Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -36,13 +36,22 @@
 #include "input_ext-intf.h"
 #include "interface.h"
 
-input_info_category_t * input_InfoCategory( input_thread_t * p_this,
+/**
+ * \brief Find info category by name.
+ *
+ * Returns a pointer to the info category with the given name, and
+ * creates it if necessary
+ *
+ * \param p_input pointer to the input thread in which the info is to be found
+ * \param psz_name the name of the category to be found
+ * \returns a pointer to the category with the given name
+ */
+input_info_category_t * input_InfoCategory( input_thread_t * p_input,
                                             char * psz_name)
 {
     input_info_category_t * p_category, * p_prev;
     p_prev = NULL;
-    msg_Dbg( p_this, "searching for category");
-    for ( p_category = p_this->stream.p_info;
+    for ( p_category = p_input->stream.p_info;
           (p_category != NULL) && strcmp( p_category->psz_name, psz_name ); 
           p_category = p_category->p_next)
     {
@@ -50,17 +59,14 @@ input_info_category_t * input_InfoCategory( input_thread_t * p_this,
     }
     if ( p_category )
     {
-        msg_Dbg(p_this, "found category at %p, with name %s", p_category
-            ,p_category->psz_name);
         return p_category;
     }
     else
     {
-        msg_Dbg( p_this, "creating new input category");
         p_category = malloc( sizeof( input_info_category_t ) );
         if ( !p_category )
         {
-            msg_Err( p_this, "No mem" );
+            msg_Err( p_input, "No mem" );
             return 0;
         }
         p_category->psz_name = strdup( psz_name );
@@ -71,11 +77,19 @@ input_info_category_t * input_InfoCategory( input_thread_t * p_this,
     }
 }
 
+/**
+ * \brief Add a info item to a category
+ *
+ * \param p_category Pointer to the category to put this info in
+ * \param psz_name Name of the info item to add
+ * \param psz_format printf style format string for the value.
+ * \return a negative number on error. 0 on success.
+ */
 int input_AddInfo( input_info_category_t * p_category, char * psz_name,
                    char * psz_format, ...)
 {
     input_info_t * p_info, * p_prev;
-    char * psz_str;
+    char * psz_str = NULL;
     va_list args;
 
     p_prev = NULL;
@@ -93,31 +107,14 @@ int input_AddInfo( input_info_category_t * p_category, char * psz_name,
     vasprintf( &psz_str, psz_format, args );
 #else
     psz_str = (char*) malloc( strlen(psz_format) + INTF_MAX_MSG_SIZE );
-#endif
-
     if( psz_str == NULL )
     {
-//        fprintf( stderr, "main warning: can't store message (%s): ",
-//                 strerror(errno) );
-//        vfprintf( stderr, psz_format, args );
-//        fprintf( stderr, "\n" );
         return -1;
     }
 
-#ifndef HAVE_VASPRINTF
-#   ifdef WIN32
-    psz_temp = ConvertPrintfFormatString( psz_format );
-    if( !psz_temp )
-    {
-        //fprintf( stderr, "main warning: couldn't print message\n" );
-        return -1;
-    }
-    vsprintf( psz_str, psz_temp, args );
-    free( psz_temp );
-#   else
     vsprintf( psz_str, psz_format, args );
-#   endif
 #endif
+
     va_end( args );
     p_info = p_category->p_info;
     while ( p_info )
@@ -144,6 +141,13 @@ int input_AddInfo( input_info_category_t * p_category, char * psz_name,
     return 0;
 }
 
+/**
+ * \brief Destroy info structures
+ * \internal
+ *
+ * \param p_input The input thread to be cleaned for info
+ * \returns for the moment 0
+ */
 int input_DelInfo( input_thread_t * p_input )
 {
     input_info_category_t * p_category, * p_prev_category;