Changeset 16471
- Timestamp:
- 06/11/12 03:07:30 (12 years ago)
- Location:
- titan
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/lcdpearl1/lcd_weather.h
r16169 r16471 97 97 tmpstr2 = tmpstr; 98 98 99 tmpstr2 = strstr(tmpstr1, "<forecast_information>");99 tmpstr2 = ostrstr(tmpstr1, "<forecast_information>"); 100 100 if(tmpstr2 != NULL) 101 101 { … … 105 105 } 106 106 107 tmpstr2 = strstr(tmpstr1, "<current_conditions>");107 tmpstr2 = ostrstr(tmpstr1, "<current_conditions>"); 108 108 if(tmpstr2 != NULL) 109 109 { … … 114 114 } 115 115 116 tmpstr2 = strstr(tmpstr1, "<forecast_conditions>");116 tmpstr2 = ostrstr(tmpstr1, "<forecast_conditions>"); 117 117 if(tmpstr2 != NULL) 118 118 { … … 126 126 } 127 127 128 tmpstr2 = strstr(tmpstr1, "<forecast_conditions>");128 tmpstr2 = ostrstr(tmpstr1, "<forecast_conditions>"); 129 129 if(tmpstr2 != NULL) 130 130 { … … 138 138 } 139 139 140 tmpstr2 = strstr(tmpstr1, "<forecast_conditions>");140 tmpstr2 = ostrstr(tmpstr1, "<forecast_conditions>"); 141 141 if(tmpstr2 != NULL) 142 142 { … … 150 150 } 151 151 152 tmpstr2 = strstr(tmpstr1, "<forecast_conditions>");152 tmpstr2 = ostrstr(tmpstr1, "<forecast_conditions>"); 153 153 if(tmpstr2 != NULL) 154 154 { … … 173 173 if(icon == NULL) 174 174 return node; 175 else if( strstr(icon, "/sunny.gif") != NULL)175 else if(ostrstr(icon, "/sunny.gif") != NULL) 176 176 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/sunny60.png", 0, 0); 177 else if( strstr(icon, "/mostly_sunny.gif") != NULL)177 else if(ostrstr(icon, "/mostly_sunny.gif") != NULL) 178 178 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/mostly_sunny60.png", 0, 0); 179 else if( strstr(icon, "/chance_of_rain.gif") != NULL)179 else if(ostrstr(icon, "/chance_of_rain.gif") != NULL) 180 180 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/chance_of_rain60.png", 0, 0); 181 else if( strstr(icon, "/partly_cloudy.gif") != NULL)181 else if(ostrstr(icon, "/partly_cloudy.gif") != NULL) 182 182 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/partly_cloudy60.png", 0, 0); 183 else if( strstr(icon, "/mostly_cloudy.gif") != NULL)183 else if(ostrstr(icon, "/mostly_cloudy.gif") != NULL) 184 184 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/mostly_cloudy60.png", 0, 0); 185 else if( strstr(icon, "/chance_of_storm.gif") != NULL)185 else if(ostrstr(icon, "/chance_of_storm.gif") != NULL) 186 186 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/chance_of_storm60.png", 0, 0); 187 else if( strstr(icon, "/showers.gif") != NULL)187 else if(ostrstr(icon, "/showers.gif") != NULL) 188 188 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/showers60.png", 0, 0); 189 else if( strstr(icon, "/rain.gif") != NULL)189 else if(ostrstr(icon, "/rain.gif") != NULL) 190 190 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/rain60.png", 0, 0); 191 else if( strstr(icon, "/chance_of_snow.gif") != NULL)191 else if(ostrstr(icon, "/chance_of_snow.gif") != NULL) 192 192 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/chance_of_snow60.png", 0, 0); 193 else if( strstr(icon, "/cloudy.gif") != NULL)193 else if(ostrstr(icon, "/cloudy.gif") != NULL) 194 194 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/cloudy60.png", 0, 0); 195 else if( strstr(icon, "/storm.gif") != NULL)195 else if(ostrstr(icon, "/storm.gif") != NULL) 196 196 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/storm60.png", 0, 0); 197 else if( strstr(icon, "/thunderstorm.gif") != NULL)197 else if(ostrstr(icon, "/thunderstorm.gif") != NULL) 198 198 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/storm60.png", 0, 0); 199 else if( strstr(icon, "/chance_of_tstorm.gif") != NULL)199 else if(ostrstr(icon, "/chance_of_tstorm.gif") != NULL) 200 200 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/chance_of_storm.png", 0, 0); 201 else if( strstr(icon, "/sleet.gif") != NULL)201 else if(ostrstr(icon, "/sleet.gif") != NULL) 202 202 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/snow60.png", 0, 0); 203 else if( strstr(icon, "/snow.gif") != NULL)203 else if(ostrstr(icon, "/snow.gif") != NULL) 204 204 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/snow60.png", 0, 0); 205 else if( strstr(icon, "/icy.gif") != NULL)205 else if(ostrstr(icon, "/icy.gif") != NULL) 206 206 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/icy60.png", 0, 0); 207 else if( strstr(icon, "/dust.gif") != NULL)208 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/fog60.png", 0, 0); 209 else if( strstr(icon, "/fog.gif") != NULL)210 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/fog60.png", 0, 0); 211 else if( strstr(icon, "/smoke.gif") != NULL)212 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/fog60.png", 0, 0); 213 else if( strstr(icon, "/haze.gif") != NULL)214 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/fog60.png", 0, 0); 215 else if( strstr(icon, "/flurries.gif") != NULL)207 else if(ostrstr(icon, "/dust.gif") != NULL) 208 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/fog60.png", 0, 0); 209 else if(ostrstr(icon, "/fog.gif") != NULL) 210 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/fog60.png", 0, 0); 211 else if(ostrstr(icon, "/smoke.gif") != NULL) 212 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/fog60.png", 0, 0); 213 else if(ostrstr(icon, "/haze.gif") != NULL) 214 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/fog60.png", 0, 0); 215 else if(ostrstr(icon, "/flurries.gif") != NULL) 216 216 node = ostrcat(node, "%pluginpath%/lcdpearl1/skin/flurries60.png", 0, 0); 217 217 return node; -
titan/plugins/networkbrowser/networkbrowser.h
r16338 r16471 321 321 322 322 //nfs parse 323 if( strstr(line, "-fstype=nfs") != NULL)323 if(ostrstr(line, "-fstype=nfs") != NULL) 324 324 { 325 325 treffer = 1; … … 343 343 344 344 //cifs parse 345 if( strstr(line, "-fstype=cifs") != NULL)345 if(ostrstr(line, "-fstype=cifs") != NULL) 346 346 { 347 347 treffer = 1; 348 348 newnode->mode = ostrcat("0", NULL, 0, 0); 349 if( strstr(line, "user=,") != NULL)349 if(ostrstr(line, "user=,") != NULL) 350 350 { 351 351 treffer = 6; … … 376 376 377 377 //ftpfs parse 378 if( strstr(line, "-fstype=ftpfs") != NULL)378 if(ostrstr(line, "-fstype=ftpfs") != NULL) 379 379 { 380 380 treffer = 1; … … 384 384 if(ret != 2) treffer = 0; 385 385 386 tmpstr = strstr(line, "ssl");386 tmpstr = ostrstr(line, "ssl"); 387 387 if(tmpstr != NULL) 388 388 { … … 393 393 } 394 394 395 tmpstr = strstr(line, "proxy=");395 tmpstr = ostrstr(line, "proxy="); 396 396 if(tmpstr != NULL) 397 397 { … … 401 401 if(ret != 3) treffer = 0; 402 402 403 tmpstr = strstr(line, "proxy_user=");403 tmpstr = ostrstr(line, "proxy_user="); 404 404 if(tmpstr != NULL) 405 405 { … … 411 411 } 412 412 413 tmpstr = strstr(line, ":ftp\\://");413 tmpstr = ostrstr(line, ":ftp\\://"); 414 414 if(tmpstr != NULL) 415 415 { 416 if( strstr(line, "@") != NULL)416 if(ostrstr(line, "@") != NULL) 417 417 { 418 418 free(newnode->userauth); newnode->userauth = NULL; … … 432 432 if(newnode->ftpport != NULL) 433 433 { 434 tmpstr = strstr(newnode->ftpport, "/");434 tmpstr = ostrstr(newnode->ftpport, "/"); 435 435 if(tmpstr != NULL) 436 436 { … … 716 716 if(flag == 1) 717 717 { 718 if( strstr(fileline, "-fstype=cifs") != NULL) continue;719 if( strstr(fileline, "-fstype=nfs") != NULL) continue;720 if( strstr(fileline, "-fstype=ftpfs") != NULL) continue;718 if(ostrstr(fileline, "-fstype=cifs") != NULL) continue; 719 if(ostrstr(fileline, "-fstype=nfs") != NULL) continue; 720 if(ostrstr(fileline, "-fstype=ftpfs") != NULL) continue; 721 721 tmpstr = ostrcat(tmpstr, fileline, 1, 0); 722 722 } … … 884 884 if(mbox1 != NULL && mbox->name != NULL) 885 885 { 886 if( strstr(mbox1->name, "(cifs)") != NULL)886 if(ostrstr(mbox1->name, "(cifs)") != NULL) 887 887 { 888 888 debug(70, "start addshare cifs"); … … 897 897 } 898 898 } 899 else if( strstr(mbox1->name, "(nfs)") != NULL)899 else if(ostrstr(mbox1->name, "(nfs)") != NULL) 900 900 { 901 901 debug(70, "start addshare nfs"); -
titan/plugins/news/news.h
r16219 r16471 137 137 tmpstr2 = tmpstr; 138 138 139 tmpstr2 = strstr(tmpstr1, "<news_entry>");139 tmpstr2 = ostrstr(tmpstr1, "<news_entry>"); 140 140 while(tmpstr2 != NULL) 141 141 { … … 146 146 last = addnews(tmpstr2, linecount, last); 147 147 if(last != NULL) tmplast = last; 148 tmpstr2 = strstr(tmpstr1, "<news_entry>");148 tmpstr2 = ostrstr(tmpstr1, "<news_entry>"); 149 149 } 150 150 -
titan/plugins/panel/panel_settings_overclocking.h
r11419 r16471 25 25 for(i = 0; tmpstr2[i] != NULL; i++) 26 26 { 27 if( strstr(tmpstr2[i], "CKGA_") != 0){27 if(ostrstr(tmpstr2[i], "CKGA_") != 0){ 28 28 free(tmpstr2[i]); tmpstr2[i] = NULL; 29 }else if( strstr(tmpstr2[i], "SYSACLKOUT") != 0){30 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 31 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 32 }else if( strstr(tmpstr2[i], "BOGOMIPS") != 0){33 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 34 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 35 }else if( strstr(tmpstr2[i], "PLL0") != 0){36 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 37 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 38 }else if( strstr(tmpstr2[i], "SH4") != 0){39 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 40 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 41 }else if( strstr(tmpstr2[i], "MODULE") != 0){42 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 43 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 44 }else if( strstr(tmpstr2[i], "SLIM") != 0){45 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 46 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 47 }else if( strstr(tmpstr2[i], "PLL1") != 0){48 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 49 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 50 }else if( strstr(tmpstr2[i], "COMMS") != 0){51 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 52 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 53 }else if( strstr(tmpstr2[i], "TMU0") != 0){54 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 55 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 56 }else if( strstr(tmpstr2[i], "TMU0") != 0){29 }else if(ostrstr(tmpstr2[i], "SYSACLKOUT") != 0){ 30 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 31 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 32 }else if(ostrstr(tmpstr2[i], "BOGOMIPS") != 0){ 33 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 34 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 35 }else if(ostrstr(tmpstr2[i], "PLL0") != 0){ 36 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 37 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 38 }else if(ostrstr(tmpstr2[i], "SH4") != 0){ 39 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 40 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 41 }else if(ostrstr(tmpstr2[i], "MODULE") != 0){ 42 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 43 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 44 }else if(ostrstr(tmpstr2[i], "SLIM") != 0){ 45 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 46 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 47 }else if(ostrstr(tmpstr2[i], "PLL1") != 0){ 48 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 49 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 50 }else if(ostrstr(tmpstr2[i], "COMMS") != 0){ 51 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 52 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 53 }else if(ostrstr(tmpstr2[i], "TMU0") != 0){ 54 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 55 tmpstr = ostrcat(tmpstr, "\n", 1, 0); 56 }else if(ostrstr(tmpstr2[i], "TMU0") != 0){ 57 57 tmpstr = ostrcat(tmpstr, tmpstr2[i], 1, 1); 58 58 tmpstr = ostrcat(tmpstr, "\n", 1, 0); -
titan/plugins/weather/weather.h
r16367 r16471 152 152 tmpstr2 = tmpstr; 153 153 154 tmpstr2 = strstr(tmpstr1, "<forecast_information>");154 tmpstr2 = ostrstr(tmpstr1, "<forecast_information>"); 155 155 if(tmpstr2 != NULL) 156 156 { … … 160 160 } 161 161 162 tmpstr2 = strstr(tmpstr1, "<current_conditions>");162 tmpstr2 = ostrstr(tmpstr1, "<current_conditions>"); 163 163 if(tmpstr2 != NULL) 164 164 { … … 169 169 } 170 170 171 tmpstr2 = strstr(tmpstr1, "<forecast_conditions>");171 tmpstr2 = ostrstr(tmpstr1, "<forecast_conditions>"); 172 172 if(tmpstr2 != NULL) 173 173 { … … 181 181 } 182 182 183 tmpstr2 = strstr(tmpstr1, "<forecast_conditions>");183 tmpstr2 = ostrstr(tmpstr1, "<forecast_conditions>"); 184 184 if(tmpstr2 != NULL) 185 185 { … … 193 193 } 194 194 195 tmpstr2 = strstr(tmpstr1, "<forecast_conditions>");195 tmpstr2 = ostrstr(tmpstr1, "<forecast_conditions>"); 196 196 if(tmpstr2 != NULL) 197 197 { … … 205 205 } 206 206 207 tmpstr2 = strstr(tmpstr1, "<forecast_conditions>");207 tmpstr2 = ostrstr(tmpstr1, "<forecast_conditions>"); 208 208 if(tmpstr2 != NULL) 209 209 { … … 229 229 if(icon == NULL) 230 230 changepic(node, NULL); 231 else if( strstr(icon, "/sunny.gif") != NULL)231 else if(ostrstr(icon, "/sunny.gif") != NULL) 232 232 changepic(node, "%pluginpath%/weather/skin/sunny.png"); 233 else if( strstr(icon, "/mostly_sunny.gif") != NULL)233 else if(ostrstr(icon, "/mostly_sunny.gif") != NULL) 234 234 changepic(node, "%pluginpath%/weather/skin/mostly_sunny.png"); 235 else if( strstr(icon, "/chance_of_rain.gif") != NULL)235 else if(ostrstr(icon, "/chance_of_rain.gif") != NULL) 236 236 changepic(node, "%pluginpath%/weather/skin/chance_of_rain.png"); 237 else if( strstr(icon, "/partly_cloudy.gif") != NULL)237 else if(ostrstr(icon, "/partly_cloudy.gif") != NULL) 238 238 changepic(node, "%pluginpath%/weather/skin/partly_cloudy.png"); 239 else if( strstr(icon, "/mostly_cloudy.gif") != NULL)239 else if(ostrstr(icon, "/mostly_cloudy.gif") != NULL) 240 240 changepic(node, "%pluginpath%/weather/skin/cloudy.png"); 241 else if( strstr(icon, "/chance_of_storm.gif") != NULL)241 else if(ostrstr(icon, "/chance_of_storm.gif") != NULL) 242 242 changepic(node, "%pluginpath%/weather/skin/chance_of_storm.png"); 243 else if( strstr(icon, "/showers.gif") != NULL)243 else if(ostrstr(icon, "/showers.gif") != NULL) 244 244 changepic(node, "%pluginpath%/weather/skin/showers.png"); 245 else if( strstr(icon, "/rain.gif") != NULL)245 else if(ostrstr(icon, "/rain.gif") != NULL) 246 246 changepic(node, "%pluginpath%/weather/skin/rain.png"); 247 else if( strstr(icon, "/chance_of_snow.gif") != NULL)247 else if(ostrstr(icon, "/chance_of_snow.gif") != NULL) 248 248 changepic(node, "%pluginpath%/weather/skin/chance_of_snow.png"); 249 else if( strstr(icon, "/cloudy.gif") != NULL)249 else if(ostrstr(icon, "/cloudy.gif") != NULL) 250 250 changepic(node, "%pluginpath%/weather/skin/cloudy.png"); 251 else if( strstr(icon, "/storm.gif") != NULL)251 else if(ostrstr(icon, "/storm.gif") != NULL) 252 252 changepic(node, "%pluginpath%/weather/skin/storm.png"); 253 else if( strstr(icon, "/thunderstorm.gif") != NULL)253 else if(ostrstr(icon, "/thunderstorm.gif") != NULL) 254 254 changepic(node, "%pluginpath%/weather/skin/storm.png"); 255 else if( strstr(icon, "/chance_of_tstorm.gif") != NULL)255 else if(ostrstr(icon, "/chance_of_tstorm.gif") != NULL) 256 256 changepic(node, "%pluginpath%/weather/skin/chance_of_storm.png"); 257 else if( strstr(icon, "/sleet.gif") != NULL)257 else if(ostrstr(icon, "/sleet.gif") != NULL) 258 258 changepic(node, "%pluginpath%/weather/skin/snow.png"); 259 else if( strstr(icon, "/snow.gif") != NULL)259 else if(ostrstr(icon, "/snow.gif") != NULL) 260 260 changepic(node, "%pluginpath%/weather/skin/snow.png"); 261 else if( strstr(icon, "/icy.gif") != NULL)261 else if(ostrstr(icon, "/icy.gif") != NULL) 262 262 changepic(node, "%pluginpath%/weather/skin/icy.png"); 263 else if( strstr(icon, "/dust.gif") != NULL)263 else if(ostrstr(icon, "/dust.gif") != NULL) 264 264 changepic(node, "%pluginpath%/weather/skin/fog.png"); 265 else if( strstr(icon, "/fog.gif") != NULL)265 else if(ostrstr(icon, "/fog.gif") != NULL) 266 266 changepic(node, "%pluginpath%/weather/skin/fog.png"); 267 else if( strstr(icon, "/smoke.gif") != NULL)267 else if(ostrstr(icon, "/smoke.gif") != NULL) 268 268 changepic(node, "%pluginpath%/weather/skin/fog.png"); 269 else if( strstr(icon, "/haze.gif") != NULL)269 else if(ostrstr(icon, "/haze.gif") != NULL) 270 270 changepic(node, "%pluginpath%/weather/skin/fog.png"); 271 else if( strstr(icon, "/flurries.gif") != NULL)271 else if(ostrstr(icon, "/flurries.gif") != NULL) 272 272 changepic(node, "%pluginpath%/weather/skin/flurries.png"); 273 273 } -
titan/titan/diseqcconfig.h
r13584 r16471 195 195 tmp = listbox->select; 196 196 197 if(listbox->select != NULL && listbox->select->name != NULL &&strstr(listbox->select->name, "diseqc_mode") != NULL && (rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL)))197 if(listbox->select != NULL && ostrstr(listbox->select->name, "diseqc_mode") != NULL && (rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL))) 198 198 { 199 199 changediseqcmode(committedcmd, cmdorder, uncommittedcmd, rotorpos, diseqcrepeat, diseqcmode->ret); -
titan/titan/fb.h
r16286 r16471 9 9 while(node != NULL) 10 10 { 11 if( strstr(node->name, name) != NULL)11 if(ostrstr(node->name, name) != NULL) 12 12 { 13 13 debug(1000, "out"); -
titan/titan/font.h
r16286 r16471 164 164 while(node != NULL) 165 165 { 166 if( strstr(node->name, name) != NULL)166 if(ostrstr(node->name, name) != NULL) 167 167 { 168 168 debug(1000, "out"); -
titan/titan/gmultiepg.h
r15781 r16471 128 128 129 129 if(epgpicon == 1) tmpstr = createpiconpath(tmpchannel, 0); 130 if( tmpstr != NULL &&strstr(tmpstr, "default.png") == NULL)130 if(ostrstr(tmpstr, "default.png") == NULL) 131 131 { 132 132 changepic(chnode, tmpstr); -
titan/titan/harddisk.h
r16229 r16471 813 813 while(fgets(fileline, MINMALLOC, fd) != NULL) 814 814 { 815 pos = strstr(fileline, "sd");815 pos = ostrstr(fileline, "sd"); 816 816 if(pos != NULL) 817 817 { … … 884 884 while(node != NULL && tmpstr != NULL) 885 885 { 886 if( strstr(tmpstr, node->device) == 0)886 if(ostrstr(tmpstr, node->device) == NULL) 887 887 { 888 888 debug(80, "remove %s", node->device); -
titan/titan/httpd.h
r16286 r16471 204 204 if(ostrcmp(query, "getgmultiepg") == 0) 205 205 buf = webgetgmultiepg(param, fmt); 206 if( query != NULL &&strstr(query, "getepgsearch") == query)206 if(ostrstr(query, "getepgsearch") == query) 207 207 buf = webgetepgsearch(query, param, fmt); 208 208 if(ostrcmp(query, "getsignal") == 0) … … 237 237 buf = ostrcat("shoot.html", NULL, 0, 0); 238 238 } 239 if( query != NULL &&strstr(query, "poweroff") == query)239 if(ostrstr(query, "poweroff") == query) 240 240 oshutdown(1, 1); 241 if( query != NULL &&strstr(query, "restart") == query)241 if(ostrstr(query, "restart") == query) 242 242 oshutdown(2, 1); 243 if( query != NULL &&strstr(query, "guirestart") == query)243 if(ostrstr(query, "guirestart") == query) 244 244 oshutdown(3, 1); 245 if( query != NULL &&strstr(query, "standby") == query)245 if(ostrstr(query, "standby") == query) 246 246 { 247 247 status.standby = 2; 248 248 addtimer(&screenstandby, START, 1000, 1, NULL, NULL, NULL); 249 249 } 250 if( query != NULL &&strstr(query, "boxstatus") == query)250 if(ostrstr(query, "boxstatus") == query) 251 251 { 252 252 if(status.standby > 0) … … 265 265 } 266 266 } 267 if( query != NULL &&strstr(query, "message") == query)267 if(ostrstr(query, "message") == query) 268 268 buf = websendmessage(query, fmt); 269 269 … … 315 315 316 316 *pbuf = c; 317 if( buf != NULL && (strstr((char*)buf, "\n\n") != NULL || strstr((char*)buf, "\r\n\r\n") != NULL))317 if(ostrstr((char*)buf, "\n\n") != NULL || ostrstr((char*)buf, "\r\n\r\n") != NULL) 318 318 break; 319 319 pbuf++; … … 322 322 if(buf != NULL) 323 323 { 324 tmpstr = strstr((char*)buf, "GET /");325 tmpstr1 = strstr((char*)buf, "Authorization: Basic ");324 tmpstr = ostrstr((char*)buf, "GET /"); 325 tmpstr1 = ostrstr((char*)buf, "Authorization: Basic "); 326 326 } 327 327 … … 369 369 htmldecode(filename, filename); 370 370 371 if( strstr(filename, "xmessage") == filename + 1 ||strstr(filename, "/cgi-bin/xmessage") == filename )371 if(ostrstr(filename, "xmessage") == filename + 1 || ostrstr(filename, "/cgi-bin/xmessage") == filename ) 372 372 { 373 373 xmessage(filename); … … 414 414 debug(250, "httpd filename=%s", filename); 415 415 416 if( strstr(filename, "/movie/") != NULL)416 if(ostrstr(filename, "/movie/") != NULL) 417 417 fullfilename = ostrcat(filename, NULL, 0, 0); 418 418 else -
titan/titan/httpdfunc.h
r16319 r16471 1718 1718 if(checkbit(flag, 0) == 1) 1719 1719 { 1720 if( strstr(tmppath, path) != tmppath)1720 if(ostrstr(tmppath, path) != tmppath) 1721 1721 { 1722 1722 free(tmppath); tmppath = NULL; … … 1918 1918 if(flag == 1) 1919 1919 { 1920 if( param != NULL &&strstr(param, path) == param)1920 if(ostrstr(param, path) == param) 1921 1921 { 1922 1922 tmpstr = changefilenameext(param, ".epg"); … … 1986 1986 if(checkbit(flag, 0) == 1) 1987 1987 { 1988 if( tmpparam != NULL &&strstr(tmpparam, path) == tmpparam)1988 if(ostrstr(tmpparam, path) == tmpparam) 1989 1989 unlink(tmpparam); 1990 1990 } … … 2278 2278 // struct service *service1; 2279 2279 2280 anode = strstr(param, "node=");2280 anode = ostrstr(param, "node="); 2281 2281 if(anode != NULL) 2282 2282 anode = anode + 5; 2283 name = strstr(param, "name=");2283 name = ostrstr(param, "name="); 2284 2284 if(name != NULL) 2285 2285 name = name + 5; 2286 begin = strstr(param, "begin=");2286 begin = ostrstr(param, "begin="); 2287 2287 if(begin != NULL) 2288 2288 begin = begin + 6; 2289 end = strstr(param, "end=");2289 end = ostrstr(param, "end="); 2290 2290 if(end != NULL) 2291 2291 end = end + 4; 2292 type = strstr(param, "type=");2292 type = ostrstr(param, "type="); 2293 2293 if(type != NULL) 2294 2294 type = type + 5; 2295 channelname = strstr(param, "channel=");2295 channelname = ostrstr(param, "channel="); 2296 2296 if(channelname != NULL) 2297 2297 channelname = channelname + 8; 2298 sid = strstr(param, "sid=");2298 sid = ostrstr(param, "sid="); 2299 2299 if(sid != NULL) 2300 2300 sid = sid + 4; 2301 tid = strstr(param, "tid=");2301 tid = ostrstr(param, "tid="); 2302 2302 if(tid != NULL) 2303 2303 tid = tid + 4; 2304 ext = strstr(param, "ext=");2304 ext = ostrstr(param, "ext="); 2305 2305 if(ext != NULL) 2306 2306 ext = ext + 4; … … 2357 2357 while(channel1 != NULL) 2358 2358 { 2359 if( strstr(channel1->name, channelname) != NULL && channel1->servicetype == 0)2359 if(ostrstr(channel1->name, channelname) != NULL && channel1->servicetype == 0) 2360 2360 { 2361 2361 if(channelnottunable(channel1) == 0) … … 2542 2542 int ext = 0; 2543 2543 2544 timerid = strstr(param, "timerid=");2544 timerid = ostrstr(param, "timerid="); 2545 2545 if(timerid != NULL) 2546 2546 { … … 2606 2606 char* timeout=NULL; 2607 2607 2608 param4 = strstr(filename, "icon=");2609 param3 = strstr(filename, "charset=");2610 param2 = strstr(filename, "timeout=");2611 param1 = strstr(filename, "caption=");2612 param = strstr(filename, "body=");2608 param4 = ostrstr(filename, "icon="); 2609 param3 = ostrstr(filename, "charset="); 2610 param2 = ostrstr(filename, "timeout="); 2611 param1 = ostrstr(filename, "caption="); 2612 param = ostrstr(filename, "body="); 2613 2613 2614 2614 if(param4 != NULL) -
titan/titan/httpdsettings.h
r14651 r16471 24 24 if(tmpstr != NULL) 25 25 { 26 pos = strstr(tmpstr, ":");26 pos = ostrstr(tmpstr, ":"); 27 27 if(pos != NULL) 28 28 { -
titan/titan/lnbconfig.h
r12534 r16471 189 189 tmp = listbox->select; 190 190 191 if(listbox->select != NULL && listbox->select->name != NULL &&strstr(listbox->select->name, "lnb_loftype") != NULL && (rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL)))191 if(listbox->select != NULL && ostrstr(listbox->select->name, "lnb_loftype") != NULL && (rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL))) 192 192 { 193 193 changeloftype(lofl, lofh, threshold, satcr, satcrfrequ1, satcrfrequ2, loftype->ret); -
titan/titan/mediadbsettings.h
r16256 r16471 70 70 if(ret != NULL) 71 71 { 72 if( strstr(ret, "/mediadb") != NULL)72 if(ostrstr(ret, "/mediadb") != NULL) 73 73 changeinput(listbox->select, ret); 74 74 else -
titan/titan/player.h
r16303 r16471 337 337 } 338 338 339 if( strstr(file, "://") == NULL)339 if(ostrstr(file, "://") == NULL) 340 340 tmpfile = ostrcat("file://", file, 0, 0); 341 341 else … … 349 349 } 350 350 351 if( strstr(tmpfile, "file://") == NULL)351 if(ostrstr(tmpfile, "file://") == NULL) 352 352 status.playercan = 0x4650; 353 353 else … … 402 402 } 403 403 404 if( strstr(file, "://") == NULL)404 if(ostrstr(file, "://") == NULL) 405 405 tmpfile = ostrcat("file://", file, 0, 0); 406 406 else … … 414 414 } 415 415 416 if( strstr(tmpfile, "file://") == NULL)416 if(ostrstr(tmpfile, "file://") == NULL) 417 417 status.playercan = 0x7E7F; 418 418 else … … 963 963 964 964 gchar *name = gst_element_get_name(sink); 965 gboolean use_get_decoder_time = strstr(name, "dvbaudiosink") ||strstr(name, "dvbvideosink");965 gboolean use_get_decoder_time = ostrstr(name, "dvbaudiosink") || ostrstr(name, "dvbvideosink"); 966 966 g_free(name); 967 967 -
titan/titan/record.h
r16286 r16471 868 868 if(servicenode->recname != NULL) 869 869 { 870 if( strstr(recname, servicenode->recname) != NULL)870 if(ostrstr(recname, servicenode->recname) != NULL) 871 871 return servicenode; 872 872 } … … 947 947 mbox = menulistbox(mlist, "recordlist", "Record", NULL, NULL, 0, 0); 948 948 949 if(mbox != NULL && mbox->param != NULL &&strstr(mbox->param, "stop") == mbox->param)949 if(mbox != NULL && ostrstr(mbox->param, "stop") == mbox->param) 950 950 { 951 951 servicenode = getrecordbyname(mbox->param, RECORDDIRECT); … … 1016 1016 if(mbox != NULL) 1017 1017 { 1018 if( mbox->param != NULL &&strstr(mbox->param, "stop") == mbox->param)1018 if(ostrstr(mbox->param, "stop") == mbox->param) 1019 1019 { 1020 1020 servicenode = getrecordbyname(mbox->param, RECORDDIRECT); … … 1022 1022 servicenode->recendtime = 1; 1023 1023 } 1024 if( mbox->param != NULL &&strstr(mbox->param, "change") == mbox->param)1024 if(ostrstr(mbox->param, "change") == mbox->param) 1025 1025 { 1026 1026 servicenode = getrecordbyname(mbox->param, RECORDDIRECT); -
titan/titan/rectimer.h
r16380 r16471 455 455 buf1 = buf; 456 456 457 if( strstr(line, "<timer ") != NULL ||strstr(line, "<log "))457 if(ostrstr(line, "<timer ") != NULL || ostrstr(line, "<log ")) 458 458 node = addrectimernode(line, node); 459 459 } -
titan/titan/sat.h
r16380 r16471 462 462 while(node != NULL) 463 463 { 464 if( strstr(node->name, name) != NULL)464 if(ostrstr(node->name, name) != NULL) 465 465 { 466 466 debug(1000, "out"); -
titan/titan/skin.h
r16445 r16471 437 437 if(getconfig("skinpath", NULL) != NULL && strlen(picname) > 0 && picname[0] != '/') 438 438 { 439 if( strstr(picname, "%pluginpath%/") != NULL)439 if(ostrstr(picname, "%pluginpath%/") != NULL) 440 440 { 441 441 tmpstr = createpath(getconfig("pluginpath", NULL), &picname[13]); … … 890 890 } 891 891 892 if( strstr(buf1, "<screen ") != NULL)892 if(ostrstr(buf1, "<screen ") != NULL) 893 893 { 894 894 node = NULL; … … 907 907 } 908 908 } 909 if( strstr(buf1, "<node ") != NULL && node != NULL)909 if(ostrstr(buf1, "<node ") != NULL && node != NULL) 910 910 addscreennode(node, buf1, NULL); 911 911 … … 3739 3739 } 3740 3740 3741 if( node->name != NULL &&strstr(node->name, "LCD_") != NULL)3741 if(ostrstr(node->name, "LCD_") != NULL) 3742 3742 { 3743 3743 merkskinfb = skinfb; -
titan/titan/sock.h
r15948 r16471 541 541 } 542 542 543 tmppos = strstr(tmpbuf, "HTTP/1.1 ");543 tmppos = ostrstr(tmpbuf, "HTTP/1.1 "); 544 544 if(tmppos != NULL) 545 545 { … … 554 554 if(stat == 301 || stat == 302) // Redirect 555 555 { 556 tmppos = strstr(tmpbuf, "Location: ");556 tmppos = ostrstr(tmpbuf, "Location: "); 557 557 if(tmppos != NULL) 558 558 { … … 666 666 *pbuf = c; 667 667 668 if( tmpbuf != NULL && (strstr(tmpbuf, "\n\n") != NULL || strstr(tmpbuf, "\r\n\r\n") != NULL))668 if(ostrstr(tmpbuf, "\n\n") != NULL || ostrstr(tmpbuf, "\r\n\r\n") != NULL) 669 669 { 670 670 hret = checkhttpheader(tmpbuf, &retstr); … … 676 676 677 677 //TODO: case-sens check 678 char* contentlen = strstr(tmpbuf, "Content-Length:");678 char* contentlen = ostrstr(tmpbuf, "Content-Length:"); 679 679 if(contentlen != NULL) 680 680 { -
titan/titan/stream.h
r16150 r16471 34 34 { 35 35 mbox = menulistbox(mlist, "menulist", "Streaming", NULL, NULL, 0, 0); 36 if( mbox != NULL &&strstr(mbox->name, "stop") == mbox->name)36 if(ostrstr(mbox->name, "stop") == mbox->name) 37 37 { 38 38 servicenode = getrecordbyname(mbox->name, RECORDSTREAM); … … 119 119 120 120 if(buf != NULL) 121 tmpstr = strstr((char*)buf, "GET /");121 tmpstr = ostrstr((char*)buf, "GET /"); 122 122 123 123 if(tmpstr != NULL) … … 151 151 htmldecode(filename, filename); 152 152 debug(250, "stream filename=%s", filename); 153 if( filename != NULL &&strstr(filename, getconfig("rec_streampath", NULL)) != filename)153 if(ostrstr(filename, getconfig("rec_streampath", NULL)) != filename) 154 154 { 155 155 filename = ostrcat("/", filename, 0, 1); -
titan/titan/thumb.h
r16431 r16471 35 35 while(qe != NULL) 36 36 { 37 if( qe->data != NULL &&strstr(qe->data, ".Thumbnails") == NULL)37 if(ostrstr(qe->data, ".Thumbnails") == NULL) 38 38 { 39 39 char* picname = createpath(qe->data, qe->data1); -
titan/titan/timezone.h
r16367 r16471 39 39 fileline[len] = '\0'; 40 40 41 pos = strstr(fileline, "<zone ");41 pos = ostrstr(fileline, "<zone "); 42 42 if(pos == NULL) 43 43 continue;
Note: See TracChangeset
for help on using the changeset viewer.