comparison m_property.c @ 29263:0f1b5b68af32

whitespace cosmetics: Remove all trailing whitespace.
author diego
date Wed, 13 May 2009 02:58:57 +0000
parents 98478619a22c
children c1a3f1bbba26
comparison
equal deleted inserted replaced
29262:7d545a6b8aff 29263:0f1b5b68af32
99 99
100 char* m_properties_expand_string(const m_option_t* prop_list,char* str, void *ctx) { 100 char* m_properties_expand_string(const m_option_t* prop_list,char* str, void *ctx) {
101 int l,fr=0,pos=0,size=strlen(str)+512; 101 int l,fr=0,pos=0,size=strlen(str)+512;
102 char *p = NULL,*e,*ret = malloc(size), num_val; 102 char *p = NULL,*e,*ret = malloc(size), num_val;
103 int skip = 0, lvl = 0, skip_lvl = 0; 103 int skip = 0, lvl = 0, skip_lvl = 0;
104 104
105 while(str[0]) { 105 while(str[0]) {
106 if(str[0] == '\\') { 106 if(str[0] == '\\') {
107 int sl = 1; 107 int sl = 1;
108 switch(str[1]) { 108 switch(str[1]) {
109 case 'e': 109 case 'e':
112 p = "\n", l = 1; break; 112 p = "\n", l = 1; break;
113 case 'r': 113 case 'r':
114 p = "\r", l = 1; break; 114 p = "\r", l = 1; break;
115 case 't': 115 case 't':
116 p = "\t", l = 1; break; 116 p = "\t", l = 1; break;
117 case 'x': 117 case 'x':
118 if(str[2]) { 118 if(str[2]) {
119 char num[3] = { str[2], str[3], 0 }; 119 char num[3] = { str[2], str[3], 0 };
120 char* end = num; 120 char* end = num;
121 num_val = strtol(num,&end,16); 121 num_val = strtol(num,&end,16);
122 sl = end-num; 122 sl = end-num;
143 else 143 else
144 l = 0; 144 l = 0;
145 str = e+1; 145 str = e+1;
146 } else if(str[0] == '?' && str[1] == '(' && (e = strchr(str+2,':'))) { 146 } else if(str[0] == '?' && str[1] == '(' && (e = strchr(str+2,':'))) {
147 lvl++; 147 lvl++;
148 if(!skip) { 148 if(!skip) {
149 int is_not = str[2] == '!'; 149 int is_not = str[2] == '!';
150 int pl = e - str - (is_not ? 3 : 2); 150 int pl = e - str - (is_not ? 3 : 2);
151 char pname[pl+1]; 151 char pname[pl+1];
152 memcpy(pname, str + (is_not ? 3 : 2), pl); 152 memcpy(pname, str + (is_not ? 3 : 2), pl);
153 pname[pl] = 0; 153 pname[pl] = 0;
159 skip = 1, skip_lvl = lvl; 159 skip = 1, skip_lvl = lvl;
160 } 160 }
161 str = e+1, l = 0; 161 str = e+1, l = 0;
162 } else 162 } else
163 p = str, l = 1, str++; 163 p = str, l = 1, str++;
164 164
165 if(skip || l <= 0) continue; 165 if(skip || l <= 0) continue;
166 166
167 if(pos+l+1 > size) { 167 if(pos+l+1 > size) {
168 size = pos+l+512; 168 size = pos+l+512;
169 ret = realloc(ret,size); 169 ret = realloc(ret,size);
170 } 170 }
171 memcpy(ret+pos,p,l); 171 memcpy(ret+pos,p,l);
172 pos += l; 172 pos += l;
173 if(fr) free(p), fr = 0; 173 if(fr) free(p), fr = 0;
174 } 174 }
175 175
176 ret[pos] = 0; 176 ret[pos] = 0;
177 return ret; 177 return ret;
178 } 178 }
179 179
180 void m_properties_print_help_list(const m_option_t* list) { 180 void m_properties_print_help_list(const m_option_t* list) {
181 char min[50],max[50]; 181 char min[50],max[50];
182 int i,count = 0; 182 int i,count = 0;
183 183
184 mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_PropertyListHeader); 184 mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_PropertyListHeader);
185 for(i = 0 ; list[i].name ; i++) { 185 for(i = 0 ; list[i].name ; i++) {
186 const m_option_t* opt = &list[i]; 186 const m_option_t* opt = &list[i];
187 if(opt->flags & M_OPT_MIN) 187 if(opt->flags & M_OPT_MIN)
188 sprintf(min,"%-8.0f",opt->min); 188 sprintf(min,"%-8.0f",opt->min);