Mercurial > mplayer.hg
comparison Gui/interface.c @ 19081:273bdef43012
Mark several string parameters that are not modified in the function as const.
patch by Stefan Huehner, stefan at huehner org
author | diego |
---|---|
date | Fri, 14 Jul 2006 16:57:24 +0000 |
parents | 86350b4b8203 |
children | e579e74d6c3c |
comparison
equal
deleted
inserted
replaced
19080:6ff62e005cba | 19081:273bdef43012 |
---|---|
52 extern mixer_t mixer; // mixer from mplayer.c | 52 extern mixer_t mixer; // mixer from mplayer.c |
53 | 53 |
54 guiInterface_t guiIntfStruct; | 54 guiInterface_t guiIntfStruct; |
55 int guiWinID=-1; | 55 int guiWinID=-1; |
56 | 56 |
57 char * gstrcat( char ** dest,char * src ) | 57 char * gstrcat( char ** dest,const char * src ) |
58 { | 58 { |
59 char * tmp = NULL; | 59 char * tmp = NULL; |
60 | 60 |
61 if ( !src ) return NULL; | 61 if ( !src ) return NULL; |
62 | 62 |
73 { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); } | 73 { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); } |
74 *dest=tmp; | 74 *dest=tmp; |
75 return tmp; | 75 return tmp; |
76 } | 76 } |
77 | 77 |
78 int gstrcmp( char * a,char * b ) | 78 int gstrcmp( const char * a,const char * b ) |
79 { | 79 { |
80 if ( !a && !b ) return 0; | 80 if ( !a && !b ) return 0; |
81 if ( !a || !b ) return -1; | 81 if ( !a || !b ) return -1; |
82 return strcmp( a,b ); | 82 return strcmp( a,b ); |
83 } | 83 } |
84 | 84 |
85 int gstrncmp( char * a,char * b,int size ) | 85 int gstrncmp( const char * a,const char * b,int size ) |
86 { | 86 { |
87 if ( !a && !b ) return 0; | 87 if ( !a && !b ) return 0; |
88 if ( !a || !b ) return -1; | 88 if ( !a || !b ) return -1; |
89 return strncmp( a,b,size ); | 89 return strncmp( a,b,size ); |
90 } | 90 } |
91 | 91 |
92 char * gstrdup( char * str ) | 92 char * gstrdup( const char * str ) |
93 { | 93 { |
94 if ( !str ) return NULL; | 94 if ( !str ) return NULL; |
95 return strdup( str ); | 95 return strdup( str ); |
96 } | 96 } |
97 | 97 |
105 { | 105 { |
106 if ( *p == NULL ) return; | 106 if ( *p == NULL ) return; |
107 free( *p ); *p=NULL; | 107 free( *p ); *p=NULL; |
108 } | 108 } |
109 | 109 |
110 void gset( char ** str,char * what ) | 110 void gset( char ** str, const char * what ) |
111 { | 111 { |
112 if ( *str ) { if ( !strstr( *str,what ) ) { gstrcat( str,"," ); gstrcat( str,what ); }} | 112 if ( *str ) { if ( !strstr( *str,what ) ) { gstrcat( str,"," ); gstrcat( str,what ); }} |
113 else gstrcat( str,what ); | 113 else gstrcat( str,what ); |
114 } | 114 } |
115 | 115 |
116 /** | 116 /** |
117 * \brief this actually creates a new list containing only one element... | 117 * \brief this actually creates a new list containing only one element... |
118 */ | 118 */ |
119 void gaddlist( char *** list,char * entry ) | 119 void gaddlist( char *** list,const char * entry ) |
120 { | 120 { |
121 int i; | 121 int i; |
122 | 122 |
123 if ( (*list) ) | 123 if ( (*list) ) |
124 { | 124 { |
133 | 133 |
134 /** | 134 /** |
135 * \brief this replaces a string starting with search by replace. | 135 * \brief this replaces a string starting with search by replace. |
136 * If not found, replace is appended. | 136 * If not found, replace is appended. |
137 */ | 137 */ |
138 void greplace(char ***list, char *search, char *replace) | 138 void greplace(char ***list, const char *search, const char *replace) |
139 { | 139 { |
140 int i = 0; | 140 int i = 0; |
141 int len = (search) ? strlen(search) : 0; | 141 int len = (search) ? strlen(search) : 0; |
142 | 142 |
143 if (*list) { | 143 if (*list) { |