Skip to content

Commit

Permalink
Make more option-parsing related function arguments const.
Browse files Browse the repository at this point in the history 
Prerequisite for making stream_open filename const in a proper way.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30737 b3059339-0415-0410-9bf9-f77b7e298cf2
  • Loading branch information
reimar committed Feb 25, 2010
1 parent b99077d commit 42096a3
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 46 deletions.
8 changes: 4 additions & 4 deletions m_config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
#define MAX_PROFILE_DEPTH 20

static int
parse_profile(const m_option_t *opt, const char *name, char *param, void *dst, int src);
parse_profile(const m_option_t *opt, const char *name, const char *param, void *dst, int src);

static void
set_profile(const m_option_t *opt, void* dst, void* src);
set_profile(const m_option_t *opt, void* dst, const void* src);

static int
show_profile(m_option_t *opt, char* name, char *param);
Expand Down Expand Up @@ -515,7 +515,7 @@ m_config_set_profile(m_config_t* config, m_profile_t* p) {
}

static int
parse_profile(const m_option_t *opt, const char *name, char *param, void *dst, int src)
parse_profile(const m_option_t *opt, const char *name, const char *param, void *dst, int src)
{
m_config_t* config = opt->priv;
char** list = NULL;
Expand Down Expand Up @@ -551,7 +551,7 @@ parse_profile(const m_option_t *opt, const char *name, char *param, void *dst, i
}

static void
set_profile(const m_option_t *opt, void *dst, void *src) {
set_profile(const m_option_t *opt, void *dst, const void *src) {
m_config_t* config = opt->priv;
m_profile_t* p;
char** list = NULL;
Expand Down
58 changes: 29 additions & 29 deletions m_option.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const m_option_t* m_option_list_find(const m_option_t* list,const char* name) {

// Default function that just does a memcpy

static void copy_opt(const m_option_t* opt,void* dst,void* src) {
static void copy_opt(const m_option_t* opt,void* dst,const void* src) {
if(dst && src)
memcpy(dst,src,opt->type->size);
}
Expand Down Expand Up @@ -93,7 +93,7 @@ static char* dup_printf(const char *fmt, ...) {

#define VAL(x) (*(int*)(x))

static int parse_flag(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_flag(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
if (src == M_CONFIG_FILE) {
if(!param) return M_OPT_MISSING_PARAM;
if (!strcasecmp(param, "yes") || /* any other language? */
Expand Down Expand Up @@ -153,7 +153,7 @@ const m_option_type_t m_option_type_flag = {

// Integer

static int parse_int(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_int(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
long long tmp_int;
char *endptr;
src = 0;
Expand Down Expand Up @@ -226,7 +226,7 @@ const m_option_type_t m_option_type_int64 = {
#undef VAL
#define VAL(x) (*(double*)(x))

static int parse_double(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_double(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
double tmp_float;
char* endptr;
src = 0;
Expand Down Expand Up @@ -296,7 +296,7 @@ const m_option_type_t m_option_type_double = {
#undef VAL
#define VAL(x) (*(float*)(x))

static int parse_float(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_float(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
double tmp;
int r= parse_double(opt, name, param, &tmp, src);
if(r==1 && dst) VAL(dst) = tmp;
Expand Down Expand Up @@ -325,7 +325,7 @@ const m_option_type_t m_option_type_float = {
#undef VAL
#define VAL(x) (*(off_t*)(x))

static int parse_position(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_position(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
off_t tmp_off;
char dummy;

Expand Down Expand Up @@ -381,7 +381,7 @@ const m_option_type_t m_option_type_position = {
#undef VAL
#define VAL(x) (*(char**)(x))

static int parse_str(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_str(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {


if (param == NULL)
Expand Down Expand Up @@ -413,7 +413,7 @@ static char* print_str(const m_option_t* opt, const void* val) {
return (val && VAL(val) && strlen(VAL(val)) > 0) ? strdup(VAL(val)) : NULL;
}

static void copy_str(const m_option_t* opt,void* dst, void* src) {
static void copy_str(const m_option_t* opt,void* dst, const void* src) {
if(dst && src) {
#ifndef NO_FREE
if(VAL(dst)) free(VAL(dst)); //FIXME!!!
Expand Down Expand Up @@ -561,10 +561,10 @@ static char *get_nextsep(char *ptr, char sep, int modify) {
return ptr;
}

static int parse_str_list(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_str_list(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
int n = 0,len = strlen(opt->name);
char *str;
char *ptr = param, *last_ptr, **res;
char *ptr = (char *)param, *last_ptr, **res;
int op = OP_NONE;

if(opt->name[len-1] == '*' && ((int)strlen(name) > len - 1)) {
Expand Down Expand Up @@ -648,7 +648,7 @@ static int parse_str_list(const m_option_t* opt,const char *name, char *param, v
return 1;
}

static void copy_str_list(const m_option_t* opt,void* dst, void* src) {
static void copy_str_list(const m_option_t* opt,void* dst, const void* src) {
int n;
char **d,**s;

Expand Down Expand Up @@ -743,7 +743,7 @@ static void free_func_pf(void* src) {
}

// Parser for func_param and func_full
static int parse_func_pf(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_func_pf(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
m_func_save_t *s,*p;

if(!dst)
Expand All @@ -764,7 +764,7 @@ static int parse_func_pf(const m_option_t* opt,const char *name, char *param, vo
return 1;
}

static void copy_func_pf(const m_option_t* opt,void* dst, void* src) {
static void copy_func_pf(const m_option_t* opt,void* dst, const void* src) {
m_func_save_t *d = NULL, *s,* last = NULL;

if(!(dst && src)) return;
Expand All @@ -790,7 +790,7 @@ static void copy_func_pf(const m_option_t* opt,void* dst, void* src) {

/////////////////// Func_param

static void set_func_param(const m_option_t* opt, void* dst, void* src) {
static void set_func_param(const m_option_t* opt, void* dst, const void* src) {
m_func_save_t* s;

if(!src) return;
Expand Down Expand Up @@ -819,7 +819,7 @@ const m_option_type_t m_option_type_func_param = {

/////////////////// Func_full

static void set_func_full(const m_option_t* opt, void* dst, void* src) {
static void set_func_full(const m_option_t* opt, void* dst, const void* src) {
m_func_save_t* s;

if(!src) return;
Expand Down Expand Up @@ -849,13 +849,13 @@ const m_option_type_t m_option_type_func_full = {
#undef VAL
#define VAL(x) (*(int*)(x))

static int parse_func(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_func(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
if(dst)
VAL(dst) += 1;
return 0;
}

static void set_func(const m_option_t* opt,void* dst, void* src) {
static void set_func(const m_option_t* opt,void* dst, const void* src) {
int i;
if(opt->priv) ((m_opt_default_func_t)opt->priv)(opt,opt->name);
for(i = 0 ; i < VAL(src) ; i++)
Expand All @@ -877,7 +877,7 @@ const m_option_type_t m_option_type_func = {

/////////////////// Print

static int parse_print(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_print(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
if(opt->type == CONF_TYPE_PRINT_INDIRECT)
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", *(char **) opt->p);
else if(opt->type == CONF_TYPE_PRINT_FUNC)
Expand Down Expand Up @@ -934,7 +934,7 @@ const m_option_type_t m_option_type_print_func = {
#undef VAL
#define VAL(x) (*(char***)(x))

static int parse_subconf(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_subconf(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
char *subparam;
char *subopt;
int nr = 0,i,r;
Expand Down Expand Up @@ -1104,7 +1104,7 @@ static struct {
{ NULL, 0 }
};

static int parse_imgfmt(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_imgfmt(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
uint32_t fmt = 0;
int i;

Expand Down Expand Up @@ -1194,7 +1194,7 @@ static struct {
{ NULL, 0 }
};

static int parse_afmt(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_afmt(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
uint32_t fmt = 0;
int i;

Expand Down Expand Up @@ -1257,7 +1257,7 @@ static double parse_timestring(const char *str)
}


static int parse_time(const m_option_t* opt,const char *name, char *param, void* dst, int src)
static int parse_time(const m_option_t* opt,const char *name, const char *param, void* dst, int src)
{
double time;

Expand Down Expand Up @@ -1292,7 +1292,7 @@ const m_option_type_t m_option_type_time = {

// Time or size (-endpos)

static int parse_time_size(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
static int parse_time_size(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
m_time_size_t ts;
char unit[4];
double end_at;
Expand Down Expand Up @@ -1523,7 +1523,7 @@ static int get_obj_params(const char* opt_name, const char* name,char* params,
}

static int parse_obj_params(const m_option_t* opt,const char *name,
char *param, void* dst, int src) {
const char *param, void* dst, int src) {
char** opts;
int r;
m_obj_params_t* p = opt->priv;
Expand Down Expand Up @@ -1637,7 +1637,7 @@ static int parse_obj_settings(const char* opt,char* str,const m_obj_list_t* list

static void free_obj_settings_list(void* dst);

static int obj_settings_list_del(const char *opt_name,char *param,void* dst, int src) {
static int obj_settings_list_del(const char *opt_name,const char *param,void* dst, int src) {
char** str_list = NULL;
int r,i,idx_max = 0;
char* rem_id = "_removed_marker_";
Expand Down Expand Up @@ -1696,7 +1696,7 @@ static int obj_settings_list_del(const char *opt_name,char *param,void* dst, int
}

static int parse_obj_settings_list(const m_option_t* opt,const char *name,
char *param, void* dst, int src) {
const char *param, void* dst, int src) {
int n = 0,r,len = strlen(opt->name);
char *str;
char *ptr, *last_ptr;
Expand Down Expand Up @@ -1849,7 +1849,7 @@ static void free_obj_settings_list(void* dst) {
VAL(dst) = NULL;
}

static void copy_obj_settings_list(const m_option_t* opt,void* dst, void* src) {
static void copy_obj_settings_list(const m_option_t* opt,void* dst, const void* src) {
m_obj_settings_t *d,*s;
int n;

Expand Down Expand Up @@ -1893,7 +1893,7 @@ const m_option_type_t m_option_type_obj_settings_list = {


static int parse_obj_presets(const m_option_t* opt,const char *name,
char *param, void* dst, int src) {
const char *param, void* dst, int src) {
m_obj_presets_t* obj_p = (m_obj_presets_t*)opt->priv;
m_struct_t *in_desc,*out_desc;
int s,i;
Expand Down Expand Up @@ -1965,7 +1965,7 @@ const m_option_type_t m_option_type_obj_presets = {
};

static int parse_custom_url(const m_option_t* opt,const char *name,
char *url, void* dst, int src) {
const char *url, void* dst, int src) {
int pos1, pos2, r, v6addr = 0;
char *ptr1=NULL, *ptr2=NULL, *ptr3=NULL, *ptr4=NULL;
m_struct_t* desc = opt->priv;
Expand Down
22 changes: 11 additions & 11 deletions m_option.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ extern const m_option_type_t m_option_type_func;
typedef void (*m_opt_default_func_t)(const m_option_t *, const char*);

/// Callback used by m_option_type_func_full options.
typedef int (*m_opt_func_full_t)(const m_option_t *, const char *, char *);
typedef int (*m_opt_func_full_t)(const m_option_t *, const char *, const char *);

/// Callback used by m_option_type_func_param options.
typedef int (*m_opt_func_param_t)(const m_option_t *, const char *);
Expand Down Expand Up @@ -198,9 +198,9 @@ extern const m_obj_params_t m_span_params_def;

/// Option type description
struct m_option_type {
char* name;
const char* name;
/// Syntax description, etc
char* comments;
const char* comments;
/// Size needed for the data.
unsigned int size;
/// See \ref OptionTypeFlags.
Expand All @@ -218,7 +218,7 @@ struct m_option_type {
* \return On error a negative value is returned, on success the number of arguments
* consumed. For details see \ref OptionParserReturn.
*/
int (*parse)(const m_option_t* opt,const char *name, char *param, void* dst, int src);
int (*parse)(const m_option_t* opt,const char *name, const char *param, void* dst, int src);

/// Print back a value in string form.
/** \param opt The option to print.
Expand All @@ -241,21 +241,21 @@ struct m_option_type {
* \param dst Pointer to the destination memory.
* \param src Pointer to the source memory.
*/
void (*save)(const m_option_t* opt,void* dst, void* src);
void (*save)(const m_option_t* opt,void* dst, const void* src);

/// Set the value in the program (dst) from a save slot.
/** \param opt The option to copy.
* \param dst Pointer to the destination memory.
* \param src Pointer to the source memory.
*/
void (*set)(const m_option_t* opt,void* dst, void* src);
void (*set)(const m_option_t* opt,void* dst, const void* src);

/// Copy the data between two save slots. If NULL and size is > 0 a memcpy will be used.
/** \param opt The option to copy.
* \param dst Pointer to the destination memory.
* \param src Pointer to the source memory.
*/
void (*copy)(const m_option_t* opt,void* dst, void* src);
void (*copy)(const m_option_t* opt,void* dst, const void* src);
//@}

/// Free the data allocated for a save slot.
Expand Down Expand Up @@ -483,7 +483,7 @@ const m_option_t* m_option_list_find(const m_option_t* list,const char* name);

/// Helper to parse options, see \ref m_option_type::parse.
inline static int
m_option_parse(const m_option_t* opt,const char *name, char *param, void* dst, int src) {
m_option_parse(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
return opt->type->parse(opt,name,param,dst,src);
}

Expand All @@ -498,21 +498,21 @@ m_option_print(const m_option_t* opt, const void* val_ptr) {

/// Helper around \ref m_option_type::save.
inline static void
m_option_save(const m_option_t* opt,void* dst, void* src) {
m_option_save(const m_option_t* opt,void* dst, const void* src) {
if(opt->type->save)
opt->type->save(opt,dst,src);
}

/// Helper around \ref m_option_type::set.
inline static void
m_option_set(const m_option_t* opt,void* dst, void* src) {
m_option_set(const m_option_t* opt,void* dst, const void* src) {
if(opt->type->set)
opt->type->set(opt,dst,src);
}

/// Helper around \ref m_option_type::copy.
inline static void
m_option_copy(const m_option_t* opt,void* dst, void* src) {
m_option_copy(const m_option_t* opt,void* dst, const void* src) {
if(opt->type->copy)
opt->type->copy(opt,dst,src);
else if(opt->type->size > 0)
Expand Down
2 changes: 1 addition & 1 deletion m_struct.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ m_struct_alloc(const m_struct_t* st) {
}

int
m_struct_set(const m_struct_t* st, void* obj, char* field, char* param) {
m_struct_set(const m_struct_t* st, void* obj, const char* field, const char* param) {
const m_option_t* f = m_struct_get_field(st,field);

if(!f) {
Expand Down
2 changes: 1 addition & 1 deletion m_struct.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ m_struct_alloc(const m_struct_t* st);
* \return 0 on error, 1 on success.
*/
int
m_struct_set(const m_struct_t* st, void* obj, char* field, char* param);
m_struct_set(const m_struct_t* st, void* obj, const char* field, const char* param);

/// Reset a field (or all if field == NULL) to defaults.
/** \param st Struct definition.
Expand Down

0 comments on commit 42096a3

Please sign in to comment.