From 0cace1d72251d0a5be79e58c6e8001406cb1da4e Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 13 Jun 2011 19:33:17 +0000 Subject: [PATCH] playtree: make some char * function arguments const Remove a pointless "return". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33607 b3059339-0415-0410-9bf9-f77b7e298cf2 Mark some char * arguments that are strdup'd const, makes the API slightly clearer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33608 b3059339-0415-0410-9bf9-f77b7e298cf2 --- playtree.c | 11 +++++------ playtree.h | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/playtree.c b/playtree.c index c9a4cbc69a..23859394b9 100644 --- a/playtree.c +++ b/playtree.c @@ -279,7 +279,7 @@ play_tree_set_parent(play_tree_t* pt, play_tree_t* parent) { void -play_tree_add_file(play_tree_t* pt,char* file) { +play_tree_add_file(play_tree_t* pt,const char* file) { int n = 0; #ifdef MP_DEBUG @@ -310,7 +310,7 @@ play_tree_add_file(play_tree_t* pt,char* file) { } int -play_tree_remove_file(play_tree_t* pt,char* file) { +play_tree_remove_file(play_tree_t* pt,const char* file) { int n,f = -1; #ifdef MP_DEBUG @@ -349,7 +349,7 @@ play_tree_remove_file(play_tree_t* pt,char* file) { } void -play_tree_set_param(play_tree_t* pt, char* name, char* val) { +play_tree_set_param(play_tree_t* pt, const char* name, const char* val) { int n = 0; #ifdef MP_DEBUG @@ -373,7 +373,7 @@ play_tree_set_param(play_tree_t* pt, char* name, char* val) { } int -play_tree_unset_param(play_tree_t* pt, char* name) { +play_tree_unset_param(play_tree_t* pt, const char* name) { int n,ni = -1; #ifdef MP_DEBUG @@ -473,7 +473,6 @@ play_tree_iter_push_params(play_tree_iter_t* iter) { if(!pt->child) iter->entry_pushed = 1; - return; } play_tree_iter_t* @@ -934,7 +933,7 @@ void pt_iter_replace_entry(play_tree_iter_t* iter, play_tree_t* entry) } //Add a new file as a new entry -void pt_add_file(play_tree_t** ppt, char* filename) +void pt_add_file(play_tree_t** ppt, const char* filename) { play_tree_t *pt = *ppt, *entry = play_tree_new(); #ifdef MP_DEBUG diff --git a/playtree.h b/playtree.h index c7bfaeb7f1..380f989133 100644 --- a/playtree.h +++ b/playtree.h @@ -179,20 +179,20 @@ play_tree_remove(play_tree_t* pt, int free_it,int with_children); /// Add a file to an item. void -play_tree_add_file(play_tree_t* pt,char* file); +play_tree_add_file(play_tree_t* pt,const char* file); /// Remove a file from an item. int -play_tree_remove_file(play_tree_t* pt,char* file); +play_tree_remove_file(play_tree_t* pt,const char* file); /// Add a config paramter to an item. void -play_tree_set_param(play_tree_t* pt, char* name, char* val); +play_tree_set_param(play_tree_t* pt, const char* name, const char* val); /// Remove a config parameter from an item. int -play_tree_unset_param(play_tree_t* pt, char* name); +play_tree_unset_param(play_tree_t* pt, const char* name); /// Copy the config parameters from one item to another. void @@ -285,7 +285,7 @@ void pt_iter_insert_entry(play_tree_iter_t* iter, play_tree_t* entry); void pt_iter_replace_entry(play_tree_iter_t* iter, play_tree_t* entry); /// Adds a new file to the playtree, if it is not valid it is created. -void pt_add_file(play_tree_t** ppt, char* filename); +void pt_add_file(play_tree_t** ppt, const char* filename); // A macro to use only the iter and not the other things. #define pt_iter_add_file(iter, filename) pt_add_file(&iter->tree, filename)