From 78c0815c4118fe24ab78cce2dc48a6232dcd824a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 2 Jun 2012 20:55:18 +0000 Subject: - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp | 2 +- .../players/foo_mlt/foobar2000/SDK/cfg_var.cpp | 2 +- .../players/foo_mlt/foobar2000/SDK/config_object.cpp | 2 +- .../players/foo_mlt/foobar2000/SDK/filesystem.cpp | 4 ++-- .../foo_mlt/foobar2000/SDK/filesystem_helper.h | 2 +- .../players/foo_mlt/foobar2000/SDK/input.cpp | 2 +- .../foo_mlt/foobar2000/SDK/metadb_handle_list.cpp | 2 +- .../foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp | 2 +- .../foo_mlt/foobar2000/helpers/ProfileCache.h | 2 +- .../players/foo_mlt/foobar2000/helpers/ThreadUtils.h | 10 +++++----- .../foo_mlt/foobar2000/helpers/cue_creator.cpp | 2 +- .../foobar2000/helpers/file_info_const_impl.cpp | 6 +++--- .../foo_mlt/foobar2000/helpers/filetimetools.cpp | 2 +- .../foo_mlt/foobar2000/helpers/listview_helper.cpp | 2 +- .../foo_mlt/foobar2000/helpers/text_file_loader.cpp | 2 +- .../players/foo_mlt/foobar2000/helpers/wildcard.cpp | 2 +- .../players/foo_mlt/foobar2000/shared/shared.h | 2 +- plugins/ListeningTo/players/foo_mlt/pfc/array.h | 2 +- plugins/ListeningTo/players/foo_mlt/pfc/avltree.h | 6 +++--- plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp | 6 +++--- plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp | 2 +- plugins/ListeningTo/players/foo_mlt/pfc/iterators.h | 4 ++-- plugins/ListeningTo/players/foo_mlt/pfc/other.cpp | 4 ++-- .../ListeningTo/players/foo_mlt/pfc/pathUtils.cpp | 2 +- plugins/ListeningTo/players/foo_mlt/pfc/primitives.h | 8 ++++---- plugins/ListeningTo/players/foo_mlt/pfc/string.cpp | 20 ++++++++++---------- plugins/ListeningTo/players/foo_mlt/pfc/string.h | 8 ++++---- .../ListeningTo/players/foo_mlt/pfc/stringNew.cpp | 4 ++-- plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h | 2 +- .../ListeningTo/players/foo_mlt/pfc/string_conv.cpp | 2 +- plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp | 10 +++++----- plugins/ListeningTo/players/winamp_mlt/wa_ipc.h | 6 +++--- 32 files changed, 67 insertions(+), 67 deletions(-) (limited to 'plugins/ListeningTo') diff --git a/plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp b/plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp index 8b2d2a262e..59b6ba3168 100644 --- a/plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp @@ -374,7 +374,7 @@ public: } void on_quit() { - if(!g_off && FindWindow(MIRANDA_WINDOWCLASS, NULL) != NULL) + if (!g_off && FindWindow(MIRANDA_WINDOWCLASS, NULL) != NULL) SendData(L"0\\0foobar2000\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0"); } }; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/cfg_var.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/cfg_var.cpp index b374014164..ad00db236f 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/cfg_var.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/cfg_var.cpp @@ -9,7 +9,7 @@ void cfg_var_reader::config_read_file(stream_reader * p_stream,abort_callback & for(cfg_var_reader * walk = g_list; walk != NULL; walk = walk->m_next) { vars.set(walk->m_guid,walk); } - for(;;) { + for (;;) { GUID guid; t_uint32 size; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/config_object.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/config_object.cpp index 8de3814e54..76ba27d35a 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/config_object.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/config_object.cpp @@ -184,7 +184,7 @@ void config_object_impl::set_data(stream_reader * p_stream,abort_callback & p_ab m_data.set_size(0); enum {delta = 1024}; t_uint8 buffer[delta]; - for(;;) + for (;;) { t_size delta_done = p_stream->read(buffer,delta,p_abort); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem.cpp index 5cc6879cea..a3c0405e9e 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem.cpp @@ -615,7 +615,7 @@ void stream_reader::read_string_ex(pfc::string_base & p_out,t_size p_bytes,abort pfc::array_t temp; t_size allocWalk = expBase; t_size done = 0; - for(;;) { + for (;;) { const t_size target = pfc::min_t(allocWalk, p_bytes); temp.set_size(target); read_object(temp.get_ptr() + done, target - done, p_abort); @@ -640,7 +640,7 @@ void stream_reader::read_string_raw(pfc::string_base & p_out,abort_callback & p_ enum {delta = 256}; char buffer[delta]; p_out.reset(); - for(;;) { + for (;;) { t_size delta_done; delta_done = read(buffer,delta,p_abort); p_out.add_string(buffer,delta_done); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem_helper.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem_helper.h index 5e6769ea9c..5c537e67b7 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem_helper.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem_helper.h @@ -662,5 +662,5 @@ private: #define FB2K_RETRY_ON_SHARING_VIOLATION(OP, ABORT, TIMEOUT) \ { \ pfc::lores_timer timer; timer.start(); \ - for(;;) try { {OP;} break; } catch(exception_io_sharing_violation) { if (timer.query() > TIMEOUT) throw; ABORT.sleep(0.01); } \ + for (;;) try { {OP;} break; } catch(exception_io_sharing_violation) { if (timer.query() > TIMEOUT) throw; ABORT.sleep(0.01); } \ } diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/input.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/input.cpp index 2e9dd0aca6..3af8caaa65 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/input.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/input.cpp @@ -203,7 +203,7 @@ void input_entry::g_open_for_info_write(service_ptr_t & p_ins void input_entry::g_open_for_info_write_timeout(service_ptr_t & p_instance,service_ptr_t p_filehint,const char * p_path,abort_callback & p_abort,double p_timeout,bool p_from_redirect) { pfc::lores_timer timer; timer.start(); - for(;;) { + for (;;) { try { g_open_for_info_write(p_instance,p_filehint,p_path,p_abort,p_from_redirect); break; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/metadb_handle_list.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/metadb_handle_list.cpp index eeffb79aa2..eb68fff666 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/metadb_handle_list.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/metadb_handle_list.cpp @@ -101,7 +101,7 @@ namespace { pfc::string8_fastalloc temp; temp.prealloc(512); const t_size total = m_items.get_size(); - for(;;) { + for (;;) { const t_size index = (*m_walk)++; if (index >= total) break; m_out[index].index = index; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp index 516bf3750d..384bb812b1 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp @@ -46,7 +46,7 @@ void tag_processor_id3v2::g_remove_ex(tag_write_callback & p_callback,const serv t_size tag_processor_id3v2::g_multiskip(const service_ptr_t & p_file,t_filesize & p_size_skipped,abort_callback & p_abort) { t_filesize offset = 0; t_size count = 0; - for(;;) { + for (;;) { t_filesize delta; g_skip_at(p_file, offset, delta, p_abort); if (delta == 0) break; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ProfileCache.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ProfileCache.h index 4425097c87..05497ce011 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ProfileCache.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ProfileCache.h @@ -31,7 +31,7 @@ namespace ProfileCache { throw; } pfc::array_t buffer; buffer.set_size(64*1024); - for(;;) { + for (;;) { t_size delta = buffer.get_size(); delta = fRemote->read(buffer.get_ptr(), delta, abort); fLocal->write(buffer.get_ptr(), delta, abort); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ThreadUtils.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ThreadUtils.h index 2b42213ba5..bc20bd2298 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ThreadUtils.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ThreadUtils.h @@ -28,7 +28,7 @@ namespace ThreadUtils { static void WaitAbortable_MsgLoop(HANDLE ev, abort_callback & abort) { const HANDLE handles[2] = {ev, abort.get_abort_event()}; - for(;;) { + for (;;) { SetLastError(0); const DWORD status = MsgWaitForMultipleObjects(2, handles, FALSE, INFINITE, QS_ALLEVENTS); switch(status) { @@ -54,7 +54,7 @@ namespace ThreadUtils { pfc::array_t handles; handles.set_size(evCount + 1); handles[0] = abort.get_abort_event(); pfc::memcpy_t(handles.get_ptr() + 1, ev, evCount); - for(;;) { + for (;;) { SetLastError(0); const DWORD status = MsgWaitForMultipleObjects(handles.get_count(), handles.get_ptr(), FALSE, INFINITE, QS_ALLEVENTS); switch(status) { @@ -84,7 +84,7 @@ namespace ThreadUtils { PFC_ASSERT( timeout != INFINITE ); const DWORD entry = GetTickCount(); const HANDLE handles[1] = {abort.get_abort_event()}; - for(;;) { + for (;;) { const DWORD done = GetTickCount() - entry; if (done >= timeout) return; SetLastError(0); @@ -106,7 +106,7 @@ namespace ThreadUtils { PFC_ASSERT( timeout != INFINITE ); const DWORD entry = GetTickCount(); const HANDLE handles[2] = {ev, abort.get_abort_event()}; - for(;;) { + for (;;) { const DWORD done = GetTickCount() - entry; if (done >= timeout) return false; SetLastError(0); @@ -246,7 +246,7 @@ namespace ThreadUtils { TRACK_CALL_TEXT("CSingleThreadWrapper entry"); try { TBase instance; - for(;;) { + for (;;) { command_ptr cmd; if (processMsgs) m_commands.Get_MsgLoop(cmd, m_threadAbort); else m_commands.Get(cmd, m_threadAbort); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/cue_creator.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/cue_creator.cpp index 048700ec94..8752c12472 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/cue_creator.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/cue_creator.cpp @@ -28,7 +28,7 @@ static bool is_meta_same_everywhere(const cue_creator::t_entry_list & p_list,con iter = p_list.first(); if (!iter.is_valid()) return false; if (!iter->m_infos.meta_format(p_meta,reference)) return false; - for(;iter.is_valid();++iter) + for (;iter.is_valid();++iter) { if (!iter->m_infos.meta_format(p_meta,temp)) return false; if (strcmp(temp,reference)!=0) return false; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/file_info_const_impl.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/file_info_const_impl.cpp index 41e2e1560d..5e20ea177e 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/file_info_const_impl.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/file_info_const_impl.cpp @@ -182,7 +182,7 @@ void file_info_const_impl::copy(const file_info & p_source) { // profiler(file_info_const_impl__copy__pass2); t_size index; - for( index = 0; index < m_meta_count; index ++ ) + for ( index = 0; index < m_meta_count; index ++ ) { t_size val; const t_size val_max = p_source.meta_enum_value_count(index); @@ -204,12 +204,12 @@ void file_info_const_impl::copy(const file_info & p_source) else { meta[index].m_valuemap = valuemap; - for( val = 0; val < val_max ; val ++ ) + for ( val = 0; val < val_max ; val ++ ) *(valuemap ++ ) = stringbuffer_append(stringbuffer, p_source.meta_enum_value(index,val) ); } } - for( index = 0; index < m_info_count; index ++ ) + for ( index = 0; index < m_info_count; index ++ ) { const char * name = p_source.info_enum_name(index); const char * name_opt = optimize_infoname(name); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/filetimetools.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/filetimetools.cpp index 0d38e95e50..a5a9068b06 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/filetimetools.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/filetimetools.cpp @@ -31,7 +31,7 @@ t_filetimestamp foobar2000_io::filetimestamp_from_string(const char * date) { t_size remaining = strlen(date); SYSTEMTIME st = {}; st.wDay = 1; st.wMonth = 1; - for(;;) { + for (;;) { #define ADVANCE(n) { PFC_ASSERT( remaining >= n); date += n; remaining -= n; } #define ADVANCE_TEST(n) { if (remaining < n) throw exception_time_error(); } #define PARSE(var, digits) { ADVANCE_TEST(digits); var = (WORD) ParseDateElem(date, digits); ADVANCE(digits) ; } diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/listview_helper.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/listview_helper.cpp index c434405c26..28eee6ff6f 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/listview_helper.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/listview_helper.cpp @@ -138,7 +138,7 @@ static bool ProbeColumn(HWND view, int index) { int ListView_GetColumnCount(HWND listView) { if (!ProbeColumn(listView, 0)) return 0; int hi = 1; - for(;;) { + for (;;) { if (!ProbeColumn(listView, hi)) break; hi <<= 1; if (hi <= 0) { diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/text_file_loader.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/text_file_loader.cpp index ec63ff4039..b88403a352 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/text_file_loader.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/text_file_loader.cpp @@ -48,7 +48,7 @@ namespace text_file_loader mem.set_size(delta); - for(;;) + for (;;) { done = p_file->read(mem.get_ptr(),delta,p_abort); if (done > 0) diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/wildcard.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/wildcard.cpp index c97eee4338..6021e4e569 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/wildcard.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/wildcard.cpp @@ -2,7 +2,7 @@ static bool test_recur(const char * fn,const char * rm,bool b_sep) { - for(;;) + for (;;) { if ((b_sep && *rm==';') || *rm==0) return *fn==0; else if (*rm=='*') diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h index 5d57dbc921..ce91ae029c 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h @@ -814,7 +814,7 @@ private: static bool IsPointInsideControl(const POINT& pt, HWND wnd) { HWND walk = WindowFromPoint(pt); - for(;;) { + for (;;) { if (walk == NULL) return false; if (walk == wnd) return true; if (GetWindowLong(walk,GWL_STYLE) & WS_POPUP) return false; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/array.h b/plugins/ListeningTo/players/foo_mlt/pfc/array.h index 9e5c10359c..0ad6be2499 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/array.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/array.h @@ -224,7 +224,7 @@ namespace pfc { template static int compare(const t_array1 & p_array1, const t_array2 & p_array2) { t_size walk = 0; - for(;;) { + for (;;) { if (walk >= p_array1.get_size() && walk >= p_array2.get_size()) return 0; else if (walk >= p_array1.get_size()) return -1; else if (walk >= p_array2.get_size()) return 1; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/avltree.h b/plugins/ListeningTo/players/foo_mlt/pfc/avltree.h index ff273719e2..930e003212 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/avltree.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/avltree.h @@ -43,10 +43,10 @@ namespace pfc { t_rawptr step(bool direction) throw() { t_self* walk = this; - for(;;) { + for (;;) { t_self* t = walk->child(direction); if (t != NULL) return t->peakchild(!direction); - for(;;) { + for (;;) { t = walk->m_parent; if (t == NULL) return NULL; if (t->which_child(walk) != direction) return t; @@ -56,7 +56,7 @@ namespace pfc { } t_rawptr peakchild(bool direction) throw() { t_self* walk = this; - for(;;) { + for (;;) { t_rawptr next = walk->child(direction); if (next == NULL) return walk; walk = next; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp index ce1c36e97a..c2a7db0f12 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp @@ -48,7 +48,7 @@ namespace pfc { { const t_size max = textLen - 4; t_size textWalk = 0; - for(; textWalk < max; textWalk ++) { + for (; textWalk < max; textWalk ++) { const t_uint8 v = alphabetRev[(t_uint8)text[textWalk]]; if (v == 0xFF) throw pfc::exception_invalid_params(); bitWriter::set_bits(reinterpret_cast(out),outWritePtr,v,6); @@ -57,7 +57,7 @@ namespace pfc { t_uint8 temp[3]; t_size tempWritePtr = 0; - for(; textWalk < textLen; textWalk ++) { + for (; textWalk < textLen; textWalk ++) { const char c = text[textWalk]; if (c == '=') break; const t_uint8 v = alphabetRev[(t_uint8)c]; @@ -65,7 +65,7 @@ namespace pfc { bitWriter::set_bits(temp,tempWritePtr,v,6); tempWritePtr += 6; } - for(; textWalk < textLen; textWalk ++) { + for (; textWalk < textLen; textWalk ++) { if (text[textWalk] != '=') throw pfc::exception_invalid_params(); } memcpy(reinterpret_cast(out) + (outWritePtr/8), temp, tempWritePtr/8); diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp index ed0fc02080..c90a9eac08 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp @@ -41,7 +41,7 @@ unsigned GUID_from_text::read_dword(const char * ptr) void GUID_from_text::read_bytes(BYTE * out,unsigned num,const char * ptr) { - for(;num;num--) + for (;num;num--) { *out = read_byte(ptr); out++;ptr+=2; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/iterators.h b/plugins/ListeningTo/players/foo_mlt/pfc/iterators.h index 5455990cc4..bc68c65f41 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/iterators.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/iterators.h @@ -86,7 +86,7 @@ namespace pfc { static int compare(const t_list1 & p_list1, const t_list2 p_list2) { typename t_list1::const_iterator iter1 = p_list1.first(); typename t_list2::const_iterator iter2 = p_list2.first(); - for(;;) { + for (;;) { if (iter1.is_empty() && iter2.is_empty()) return 0; else if (iter1.is_empty()) return -1; else if (iter2.is_empty()) return 1; @@ -103,7 +103,7 @@ namespace pfc { static bool listEquals(const t_list1 & p_list1, const t_list2 & p_list2) { typename t_list1::const_iterator iter1 = p_list1.first(); typename t_list2::const_iterator iter2 = p_list2.first(); - for(;;) { + for (;;) { if (iter1.is_empty() && iter2.is_empty()) return true; else if (iter1.is_empty() || iter2.is_empty()) return false; else if (*iter1 != *iter2) return false; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/other.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/other.cpp index 4db4b59011..fcb5a07b4c 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/other.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/other.cpp @@ -37,7 +37,7 @@ namespace pfc { if (p_delta<0) { - for(;p_delta<0;p_delta++) + for (;p_delta<0;p_delta++) { t_size idx; for(idx=1;idx0;p_delta--) + for (;p_delta>0;p_delta--) { t_size idx; for(idx=count-2;(int)idx>=0;idx--) diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/pathUtils.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/pathUtils.cpp index 84e5156c51..e936e656fa 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/pathUtils.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/pathUtils.cpp @@ -105,7 +105,7 @@ string replaceIllegalNameChars(string fn, bool allowWC) { bool isInsideDirectory(pfc::string directory, pfc::string inside) { //not very efficient string walk = inside; - for(;;) { + for (;;) { walk = getParent(walk); if (walk == "") return false; if (equals(directory,walk)) return true; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/primitives.h b/plugins/ListeningTo/players/foo_mlt/pfc/primitives.h index dbdc8bc160..77444e8b67 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/primitives.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/primitives.h @@ -368,7 +368,7 @@ namespace pfc { t_size subtract_sorted_lists_calculate_count(const t_source1 & p_source1, const t_source2 & p_source2) { t_size walk1 = 0, walk2 = 0, walk_out = 0; const t_size max1 = p_source1.get_size(), max2 = p_source2.get_size(); - for(;;) { + for (;;) { int state; if (walk1 < max1 && walk2 < max2) { state = pfc::compare_t(p_source1[walk1],p_source2[walk2]); @@ -393,7 +393,7 @@ namespace pfc { p_destination.set_size(subtract_sorted_lists_calculate_count(p_source1,p_source2)); t_size walk1 = 0, walk2 = 0, walk_out = 0; const t_size max1 = p_source1.get_size(), max2 = p_source2.get_size(); - for(;;) { + for (;;) { int state; if (walk1 < max1 && walk2 < max2) { state = pfc::compare_t(p_source1[walk1],p_source2[walk2]); @@ -416,7 +416,7 @@ namespace pfc { t_size merge_sorted_lists_calculate_count(const t_source1 & p_source1, const t_source2 & p_source2) { t_size walk1 = 0, walk2 = 0, walk_out = 0; const t_size max1 = p_source1.get_size(), max2 = p_source2.get_size(); - for(;;) { + for (;;) { int state; if (walk1 < max1 && walk2 < max2) { state = pfc::compare_t(p_source1[walk1],p_source2[walk2]); @@ -441,7 +441,7 @@ namespace pfc { p_destination.set_size(merge_sorted_lists_calculate_count(p_source1,p_source2)); t_size walk1 = 0, walk2 = 0, walk_out = 0; const t_size max1 = p_source1.get_size(), max2 = p_source2.get_size(); - for(;;) { + for (;;) { int state; if (walk1 < max1 && walk2 < max2) { state = pfc::compare_t(p_source1[walk1],p_source2[walk2]); diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/string.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/string.cpp index a1506128e4..9b235c5845 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/string.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/string.cpp @@ -315,7 +315,7 @@ int strcmp_ex(const char* p1,t_size n1,const char* p2,t_size n2) { t_size idx = 0; n1 = strlen_max(p1,n1); n2 = strlen_max(p2,n2); - for(;;) + for (;;) { if (idx == n1 && idx == n2) return 0; else if (idx == n1) return -1;//end of param1 @@ -384,7 +384,7 @@ t_int64 atoi64_ex(const char * src,t_size len) int stricmp_ascii_ex(const char * const s1,t_size const len1,const char * const s2,t_size const len2) throw() { t_size walk1 = 0, walk2 = 0; - for(;;) { + for (;;) { char c1 = (walk1 < len1) ? s1[walk1] : 0; char c2 = (walk2 < len2) ? s2[walk2] : 0; c1 = ascii_tolower(c1); c2 = ascii_tolower(c2); @@ -397,7 +397,7 @@ int stricmp_ascii_ex(const char * const s1,t_size const len1,const char * const } int stricmp_ascii(const char * s1,const char * s2) throw() { - for(;;) { + for (;;) { char c1 = ascii_tolower(*s1), c2 = ascii_tolower(*s2); if (c1c2) return 1; @@ -441,7 +441,7 @@ format_hex::format_hex(t_uint64 p_val,unsigned p_width) if (n > 16 - p_width) n = 16 - p_width; char * out = m_buffer; - for(;n<16;n++) + for (;n<16;n++) *(out++) = temp[n]; *out = 0; } @@ -469,7 +469,7 @@ format_hex_lowercase::format_hex_lowercase(t_uint64 p_val,unsigned p_width) if (n > 16 - p_width) n = 16 - p_width; char * out = m_buffer; - for(;n<16;n++) + for (;n<16;n++) *(out++) = temp[n]; *out = 0; } @@ -497,7 +497,7 @@ format_uint::format_uint(t_uint64 val,unsigned p_width,unsigned p_base) char * out = m_buffer; - for(;n 0) { if (walk > splitBase) p_output(p_string + splitBase, walk - splitBase); @@ -880,7 +880,7 @@ namespace pfc { } template void splitStringByLines(t_out & out, const char * str) { - for(;;) { + for (;;) { const char * next = strchr(str, '\n'); if (next == NULL) { out += string_part(str, strlen(str)); break; @@ -892,7 +892,7 @@ namespace pfc { } } template void splitStringByChar(t_out & out, const char * str, char c) { - for(;;) { + for (;;) { const char * next = strchr(str, c); if (next == NULL) { out += string_part(str, strlen(str)); break; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.cpp index f6652ee5f4..1e469a02a2 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.cpp @@ -38,7 +38,7 @@ bool string::startsWith(char c) const { bool string::startsWith(string s) const { const char * walk = ptr(); const char * subWalk = s.ptr(); - for(;;) { + for (;;) { if (*subWalk == 0) return true; if (*walk != *subWalk) return false; walk++; subWalk++; @@ -66,7 +66,7 @@ char string::lastChar() const { string string::replace(stringp strOld, stringp strNew) const { t_size walk = 0; string ret; - for(;;) { + for (;;) { t_size next = indexOf(strOld, walk); if (next == ~0) { ret += subString(walk); break; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h b/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h index 2b93528e8e..121221e738 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h @@ -238,7 +238,7 @@ namespace pfc { string acc; if (iter.is_valid()) { acc = *iter; - for(++iter; iter.is_valid(); ++iter) { + for (++iter; iter.is_valid(); ++iter) { acc = acc + separator + *iter; } } diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/string_conv.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/string_conv.cpp index 77b2deed59..52280337c6 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/string_conv.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/string_conv.cpp @@ -131,7 +131,7 @@ namespace pfc { t_size estimate_utf8_to_wide(const char * p_in) { t_size inptr = 0; t_size retval = 1;//1 for null terminator - for(;;) { + for (;;) { unsigned newchar = 0; t_size delta = utf8_decode_char(p_in + inptr,newchar); if (delta == 0 || newchar == 0) break; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp index 81b37d21b9..58663abbf2 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp @@ -12,7 +12,7 @@ t_size utf8_char_len_from_header(char p_c) throw() t_uint8 c = (t_uint8)p_c; t_size cnt = 0; - for(;;) + for (;;) { if ((p_c & mask_tab[cnt])==val_tab[cnt]) break; if (++cnt>=6) return 0; @@ -34,7 +34,7 @@ t_size utf8_decode_char(const char *p_utf8,unsigned & wide) throw() { unsigned res=0; unsigned n; unsigned cnt=0; - for(;;) + for (;;) { if ((*utf8&mask_tab[cnt])==val_tab[cnt]) break; if (++cnt>=max) return 0; @@ -82,7 +82,7 @@ t_size utf8_decode_char(const char *p_utf8,unsigned & wide,t_size max) throw() unsigned res=0; unsigned n; unsigned cnt=0; - for(;;) + for (;;) { if ((*utf8&mask_tab[cnt])==val_tab[cnt]) break; if (++cnt>=max) return 0; @@ -224,7 +224,7 @@ t_size utf8_char_len(const char * s,t_size max) throw() t_size skip_utf8_chars(const char * ptr,t_size count) throw() { t_size num = 0; - for(;count && ptr[num];count--) + for (;count && ptr[num];count--) { t_size d = utf8_char_len(ptr+num); if (d<=0) break; @@ -295,7 +295,7 @@ t_size strlen_utf8(const char * p,t_size num) throw() unsigned w; t_size d; t_size ret = 0; - for(;num;) + for (;num;) { d = utf8_decode_char(p,w); if (w==0 || d<=0) break; diff --git a/plugins/ListeningTo/players/winamp_mlt/wa_ipc.h b/plugins/ListeningTo/players/winamp_mlt/wa_ipc.h index 7e1f75d22b..73082908c0 100644 --- a/plugins/ListeningTo/players/winamp_mlt/wa_ipc.h +++ b/plugins/ListeningTo/players/winamp_mlt/wa_ipc.h @@ -1632,7 +1632,7 @@ typedef struct { ** ** (5.5+) ** If you pass 1 in wParam then you will have zero returned if a language pack is in use. -** if(!SendMessage(hwnd_winamp,WM_WA_IPC,1,IPC_GETLANGUAGEPACKINSTANCE)){ +** if (!SendMessage(hwnd_winamp,WM_WA_IPC,1,IPC_GETLANGUAGEPACKINSTANCE)) { ** // winamp is currently using a language pack ** } ** @@ -1753,7 +1753,7 @@ typedef struct { ** information about it such as the name of the skin file. ** ** if(uMsg == WM_WA_IPC && lParam == IPC_GETSKININFO){ -** if(is_our_skin()){ +** if(is_our_skin()) { ** return is_our_skin_name(); ** } ** } @@ -2059,7 +2059,7 @@ typedef struct { ** ** BOOL CALLBACK enumWndProc(HWND hwnd, LPARAM lParam){ ** -** if(SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)hwnd,IPC_FF_ISMAINWND)){ +** if(SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)hwnd,IPC_FF_ISMAINWND)) { ** // do processing in here ** // or continue the enum for other main windows (if they exist) ** // and just comment out the line below -- cgit v1.2.3