kiorky@khalia mpd $ diff src/conf.h ../svn/src/conf.h
18,21c18
< /**
<  *  \addtogroup conf Configuration
<  *  \{
<  * **/
---
>
64,71c61
< /**
<  * \typedef BlockParam
<  * \brief typedef of _BlockParam structure
<  **/
< /**
<  * \struct _BlockParam
<  * \brief Represents a "blockconfig param" (value{toto1="bibi";toto2="titi";}) in mpd configuration file (must be nested in a configblock)
<  **/
---
>
73,75c63,65
<       char * name;/*!< CONFIGURATION Node name */
<       char * value;/*!< Value of this configuration node */
<       int line;/*!< Line number in the configuration file */
---
>       char * name;
>       char * value;
>       int line;
77,89c67,72
< /**
<  * \typedef ConfigParam
<  * \brief typedef of _ConfigParam structure
<  **/
< /**
<  * \struct _ConfigParam
<  * \brief represents a configuration item (stored in configuration file) and its associated value
<  **/
< typedef struct _ConfigParam {
<       char * value;/*!<value of this config param*/
<       unsigned int line;/*!< line in the configuration file*/
<       BlockParam * blockParams;/*!<pointer to the parent blocksparam */
<       int numberOfBlockParams;/*!< number of nested blocksparams */
---
>
> typedef struct _ConfigParam {
>       char * value;
>       unsigned int line;
>       BlockParam * blockParams;
>       int numberOfBlockParams;
91,95c74
< /**
<  * \fn initConf
<  * \brief initiate with null values "configEntriesList struct" which is a collection
<  * containing all configuration parameters
<  * **/
---
>
101,109c80,81
<
<
< /*
<  * \fn getNextConfigParam(char * name, ConfigParam * last)
< /* \brief search for a paramater "name" in a configBlock "last".
< /* \param last  Configblock to search in. All configblocks if null
<  * \name name of the param to search for
<  * \return Pointer to the configblock where the param is
<  * */
---
> /* don't free the returned value
>    set _last_ to NULL to get first entry */
111,116c83
< /**
<  * \fn getNextConfigParam(char * name)
<  * \brief search the configuration for a specific configParamBlock
<  * \param name name of the configparam to search for
<  * \return Pointer to the ConfigParam block
<  * **/
---
>
119,124d85
< /**
<  * \fn getConfigParamValue(char * name)
<  * \brief get the value of a specific configuration param "name"
<  * \param name name of the param
<  * \return value of this param
<  * **/
126,130c87
< /**
<  * \fn forceAndGetConfigParamValue(char * name)
<  * \param "name" of the param to get value
<  * \return the value of the param , else program exits (assert)
<  * **/
---
>
133,138c90
< /**
<  * \fn registerConfigParam(char * name, int repeats, int block)
<  * \param name of the configParam to register
<  * \param repeats
<  * **/
< void registerConfigParam(char * name, int repeatable, int block) ;
---
> void registerConfigParam(char * name, int repeats, int block);
145,147d96
< /**
<  * \}
<  **//* end of Configuration Module */