bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change index parameter type from int to size_t (issue #1491)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-11-04 14:38:59 -04:00
parent f3a0ff98bb
commit cdd2a40469
19 changed files with 272 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libcef/common/string_multimap_impl.cc
View File

@ -12,13 +12,13 @@ CEF_EXPORT cef_string_multimap_t cef_string_multimap_alloc() {
return new StringMultimap;
}
CEF_EXPORT int cef_string_multimap_size(cef_string_multimap_t map) {
CEF_EXPORT size_t cef_string_multimap_size(cef_string_multimap_t map) {
DCHECK(map);
StringMultimap* impl = reinterpret_cast<StringMultimap*>(map);
return impl->size();
}
CEF_EXPORT int cef_string_multimap_find_count(cef_string_multimap_t map,
CEF_EXPORT size_t cef_string_multimap_find_count(cef_string_multimap_t map,
const cef_string_t* key) {
DCHECK(map);
DCHECK(key);
@ -28,7 +28,7 @@ CEF_EXPORT int cef_string_multimap_find_count(cef_string_multimap_t map,
CEF_EXPORT int cef_string_multimap_enumerate(cef_string_multimap_t map,
const cef_string_t* key,
int value_index,
size_t value_index,
cef_string_t* value) {
DCHECK(map);
DCHECK(key);
@ -37,15 +37,14 @@ CEF_EXPORT int cef_string_multimap_enumerate(cef_string_multimap_t map,
StringMultimap* impl = reinterpret_cast<StringMultimap*>(map);
CefString key_str(key);
DCHECK_GE(value_index, 0);
DCHECK_LT(value_index, static_cast<int>(impl->count(key_str)));
if (value_index < 0 || value_index >= static_cast<int>(impl->count(key_str)))
DCHECK_LT(value_index, impl->count(key_str));
if (value_index >= impl->count(key_str))
return 0;
std::pair<StringMultimap::iterator, StringMultimap::iterator> range_it =
impl->equal_range(key_str);
int count = value_index;
size_t count = value_index;
while (count-- && range_it.first != range_it.second)
range_it.first++;
@ -56,36 +55,34 @@ CEF_EXPORT int cef_string_multimap_enumerate(cef_string_multimap_t map,
return cef_string_set(val.c_str(), val.length(), value, true);
}
CEF_EXPORT int cef_string_multimap_key(cef_string_multimap_t map, int index,
CEF_EXPORT int cef_string_multimap_key(cef_string_multimap_t map, size_t index,
cef_string_t* key) {
DCHECK(map);
DCHECK(key);
StringMultimap* impl = reinterpret_cast<StringMultimap*>(map);
DCHECK_GE(index, 0);
DCHECK_LT(index, static_cast<int>(impl->size()));
if (index < 0 || index >= static_cast<int>(impl->size()))
DCHECK_LT(index, impl->size());
if (index >= impl->size())
return 0;
StringMultimap::const_iterator it = impl->begin();
for (int ct = 0; it != impl->end(); ++it, ct++) {
for (size_t ct = 0; it != impl->end(); ++it, ct++) {
if (ct == index)
return cef_string_set(it->first.c_str(), it->first.length(), key, true);
}
return 0;
}
CEF_EXPORT int cef_string_multimap_value(cef_string_multimap_t map, int index,
CEF_EXPORT int cef_string_multimap_value(cef_string_multimap_t map, size_t index,
cef_string_t* value) {
DCHECK(map);
DCHECK(value);
StringMultimap* impl = reinterpret_cast<StringMultimap*>(map);
DCHECK_GE(index, 0);
DCHECK_LT(index, static_cast<int>(impl->size()));
if (index < 0 || index >= static_cast<int>(impl->size()))
DCHECK_LT(index, impl->size());
if (index >= impl->size())
return 0;
StringMultimap::const_iterator it = impl->begin();
for (int ct = 0; it != impl->end(); ++it, ct++) {
for (size_t ct = 0; it != impl->end(); ++it, ct++) {
if (ct == index) {
return cef_string_set(it->second.c_str(), it->second.length(), value,
true);