- Timestamp:
- 11/20/07 23:45:14 (1 year ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
Mulberry/trunk/Sources_Common/Application/Preferences/CBlockOptionsMap.cp
r19 r143 52 52 // Partial compare 53 53 if ((::strncmp((*iter).first, mSection, len_comp) == 0) && 54 ((*iter).first[len_comp] == mSeparator[ 0UL]) &&55 (::strchr(((const char*) (*iter).first) + len_comp + 1, mSeparator[ 0UL]) == NULL) &&54 ((*iter).first[len_comp] == mSeparator[(cdstring::size_type)0]) && 55 (::strchr(((const char*) (*iter).first) + len_comp + 1, mSeparator[(cdstring::size_type)0]) == NULL) && 56 56 (num-- < 1)) 57 57 { … … 76 76 cdstring match = (*iter).first; 77 77 if ((::strncmp(match, mSection, len_comp) == 0) && 78 (match[len_comp] == mSeparator[ 0UL]) &&79 (::strchr(((const char*) match) + len_comp + 1, mSeparator[ 0UL]) != NULL))78 (match[len_comp] == mSeparator[(cdstring::size_type)0]) && 79 (::strchr(((const char*) match) + len_comp + 1, mSeparator[(cdstring::size_type)0]) != NULL)) 80 80 { 81 81 // Extract key 82 82 cdstring test_key = &match[len_comp + 1]; 83 *::strchr(test_key.c_str_mod(), mSeparator[ 0UL]) = 0;83 *::strchr(test_key.c_str_mod(), mSeparator[(cdstring::size_type)0]) = 0; 84 84 85 85 // Compare with last one … … 106 106 cdstring match = (*iter).first; 107 107 if (!::strncmp(match, mSection, len_comp) && 108 (match[len_comp] == mSeparator[ 0UL]))108 (match[len_comp] == mSeparator[(cdstring::size_type)0])) 109 109 { 110 110 // Add to found list
