Mercurial > mplayer.hg
changeset 25229:4f611a555224
Option print functions may not and do not modify value
author | reimar |
---|---|
date | Sun, 02 Dec 2007 15:56:38 +0000 |
parents | 475c6659f31c |
children | 66f140bbe1bc |
files | m_option.c m_option.h |
diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/m_option.c Sun Dec 02 15:53:33 2007 +0000 +++ b/m_option.c Sun Dec 02 15:56:38 2007 +0000 @@ -114,7 +114,7 @@ } } -static char* print_flag(const m_option_t* opt, void* val) { +static char* print_flag(const m_option_t* opt, const void* val) { if(VAL(val) == opt->min) return strdup("no"); else @@ -167,7 +167,7 @@ return 1; } -static char* print_int(const m_option_t* opt, void* val) { +static char* print_int(const m_option_t* opt, const void* val) { opt = NULL; return dup_printf("%d",VAL(val)); } @@ -239,7 +239,7 @@ return 1; } -static char* print_double(const m_option_t* opt, void* val) { +static char* print_double(const m_option_t* opt, const void* val) { opt = NULL; return dup_printf("%f",VAL(val)); } @@ -267,7 +267,7 @@ return r; } -static char* print_float(const m_option_t* opt, void* val) { +static char* print_float(const m_option_t* opt, const void* val) { opt = NULL; return dup_printf("%f",VAL(val)); } @@ -322,7 +322,7 @@ return 1; } -static char* print_position(const m_option_t* opt, void* val) { +static char* print_position(const m_option_t* opt, const void* val) { return dup_printf("%"PRId64,(int64_t)VAL(val)); } @@ -373,7 +373,7 @@ } -static char* print_str(const m_option_t* opt, void* val) { +static char* print_str(const m_option_t* opt, const void* val) { return (val && VAL(val) && strlen(VAL(val)) > 0) ? strdup(VAL(val)) : NULL; } @@ -636,7 +636,7 @@ VAL(dst) = d; } -static char* print_str_list(const m_option_t* opt, void* src) { +static char* print_str_list(const m_option_t* opt, const void* src) { char **lst = NULL; char *ret = NULL,*last = NULL; int i;
--- a/m_option.h Sun Dec 02 15:53:33 2007 +0000 +++ b/m_option.h Sun Dec 02 15:56:38 2007 +0000 @@ -204,7 +204,7 @@ * \return An allocated string containing the text value or (void*)-1 * on error. */ - char* (*print)(const m_option_t* opt, void* val); + char* (*print)(const m_option_t* opt, const void* val); /** \name * These functions are called to save/set/restore the status of the @@ -461,7 +461,7 @@ /// Helper to print options, see \ref m_option_type::print. inline static char* -m_option_print(const m_option_t* opt, void* val_ptr) { +m_option_print(const m_option_t* opt, const void* val_ptr) { if(opt->type->print) return opt->type->print(opt,val_ptr); else