[MPlayer-cvslog] r25253 - in trunk: m_config.c m_config.h

[reimar]

Author: reimar
Date: Sun Dec  2 16:35:58 2007
New Revision: 25253

Log:
First try to mark some things in m_config correctly as const


Modified:
   trunk/m_config.c
   trunk/m_config.h

Modified: trunk/m_config.c
==============================================================================
--- trunk/m_config.c	(original)
+++ trunk/m_config.c	Sun Dec  2 16:35:58 2007
@@ -29,7 +29,7 @@ static int
 show_profile(m_option_t *opt, char* name, char *param);
 
 static void
-m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix);
+m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix);
 
 static int
 list_options(m_option_t *opt, char* name, char *param);
@@ -182,7 +182,7 @@ m_config_pop(m_config_t* config) {
 }
 
 static void
-m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix) {
+m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix) {
   m_config_option_t *co;
   m_config_save_slot_t* sl;
 
@@ -206,7 +206,7 @@ m_config_add_option(m_config_t *config, 
 
   // Option with children -> add them
   if(arg->type->flags & M_OPT_TYPE_HAS_CHILD) {
-    m_option_t *ol = arg->p;
+    const m_option_t *ol = arg->p;
     int i;
     co->slots = NULL;
     for(i = 0 ; ol[i].name != NULL ; i++)
@@ -246,7 +246,7 @@ m_config_add_option(m_config_t *config, 
 }
 
 int
-m_config_register_options(m_config_t *config, m_option_t *args) {
+m_config_register_options(m_config_t *config, const m_option_t *args) {
   int i;
 
 #ifdef MP_DEBUG
@@ -374,7 +374,7 @@ m_config_check_option(m_config_t *config
 }
 
 
-m_option_t*
+const m_option_t*
 m_config_get_option(m_config_t *config, char* arg) {
   m_config_option_t *co;
 
@@ -391,9 +391,9 @@ m_config_get_option(m_config_t *config, 
     return NULL;
 }
 
-void*
+const void*
 m_config_get_option_ptr(m_config_t *config, char* arg) {
-  m_option_t* conf;
+  const m_option_t* conf;
 
 #ifdef MP_DEBUG
   assert(config != NULL);
@@ -415,7 +415,7 @@ m_config_print_option_list(m_config_t *c
 
   mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_OptionListHeader);
   for(co = config->opts ; co ; co = co->next) {
-    m_option_t* opt = co->opt;
+    const m_option_t* opt = co->opt;
     if(opt->type->flags & M_OPT_TYPE_HAS_CHILD) continue;
     if(opt->flags & M_OPT_MIN)
       sprintf(min,"%-8.0f",opt->min);

Modified: trunk/m_config.h
==============================================================================
--- trunk/m_config.h	(original)
+++ trunk/m_config.h	Sun Dec  2 16:35:58 2007
@@ -34,7 +34,7 @@ struct m_config_option {
   /// Full name (ie option:subopt).
   char* name;
   /// Option description.
-  struct m_option* opt;
+  const struct m_option* opt;
   /// Save slot stack.
   m_config_save_slot_t* slots;
   /// See \ref ConfigOptionFlags.
@@ -120,7 +120,7 @@ m_config_pop(m_config_t* config);
  *  \return 1 on success, 0 on failure.
  */
 int
-m_config_register_options(m_config_t *config, struct m_option *args);
+m_config_register_options(m_config_t *config, const struct m_option *args);
 
 /// Set an option.
 /** \param config The config object.
@@ -144,7 +144,7 @@ m_config_check_option(m_config_t *config
 /** \param config The config object.
  *  \param arg The option's name.
  */
-struct m_option*
+const struct m_option*
 m_config_get_option(m_config_t *config, char* arg);
 
 /// Print a list of all registered options.