mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-10-08 15:19:20 +00:00
clang-tidy: convert loops to range based
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
committed by
Jari Sundell
parent
bb8d677f6e
commit
0948b5f86a
@@ -268,8 +268,8 @@ object_storage::rlookup_clear(const std::string& cmd_key) {
|
||||
if (r_itr == m_rlookup.end())
|
||||
return;
|
||||
|
||||
for (rlookup_mapped_iterator first = r_itr->second.begin(), last = r_itr->second.end(); first != last; first++)
|
||||
(*first)->second.object.erase_key(cmd_key);
|
||||
for (auto& first : r_itr->second)
|
||||
first->second.object.erase_key(cmd_key);
|
||||
|
||||
r_itr->second.clear();
|
||||
}
|
||||
|
||||
+4
-4
@@ -455,8 +455,8 @@ print_object(char* first, char* last, const torrent::Object* src, int flags) {
|
||||
if (first != last)
|
||||
*first = '\0';
|
||||
|
||||
for (torrent::Object::list_const_iterator itr = src->as_list().begin(), itrEnd = src->as_list().end(); itr != itrEnd; itr++) {
|
||||
first = print_object(first, last, &*itr, flags);
|
||||
for (const auto& itr : src->as_list()) {
|
||||
first = print_object(first, last, &itr, flags);
|
||||
|
||||
// Don't expand tilde after the first element in the list.
|
||||
flags &= ~print_expand_tilde;
|
||||
@@ -497,8 +497,8 @@ print_object_std(std::string* dest, const torrent::Object* src, int flags) {
|
||||
return;
|
||||
}
|
||||
case torrent::Object::TYPE_LIST:
|
||||
for (torrent::Object::list_const_iterator itr = src->as_list().begin(), itrEnd = src->as_list().end(); itr != itrEnd; itr++) {
|
||||
print_object_std(dest, &*itr, flags);
|
||||
for (const auto& itr : src->as_list()) {
|
||||
print_object_std(dest, &itr, flags);
|
||||
|
||||
// Don't expand tilde after the first element in the list.
|
||||
flags &= ~print_expand_tilde;
|
||||
|
||||
@@ -43,11 +43,11 @@ parse_command_execute(target_type target, torrent::Object* object) {
|
||||
if (object->is_list()) {
|
||||
// For now, until we can flag the lists we want executed and those
|
||||
// we can't, disable recursion completely.
|
||||
for (torrent::Object::list_iterator itr = object->as_list().begin(), last = object->as_list().end(); itr != last; itr++) {
|
||||
if (itr->is_list())
|
||||
for (auto& itr : object->as_list()) {
|
||||
if (itr.is_list())
|
||||
continue;
|
||||
|
||||
parse_command_execute(target, &*itr);
|
||||
parse_command_execute(target, &itr);
|
||||
}
|
||||
|
||||
} else if (object->is_dict_key()) {
|
||||
@@ -203,15 +203,15 @@ call_object(const torrent::Object& command, target_type target) {
|
||||
{
|
||||
torrent::Object result;
|
||||
|
||||
for (torrent::Object::list_const_iterator itr = command.as_list().begin(), last = command.as_list().end(); itr != last; itr++)
|
||||
result = call_object(*itr, target);
|
||||
for (const auto& itr : command.as_list())
|
||||
result = call_object(itr, target);
|
||||
|
||||
return result;
|
||||
}
|
||||
case torrent::Object::TYPE_MAP:
|
||||
{
|
||||
for (torrent::Object::map_const_iterator itr = command.as_map().begin(), last = command.as_map().end(); itr != last; itr++)
|
||||
call_object(itr->second, target);
|
||||
for (const auto& itr : command.as_map())
|
||||
call_object(itr.second, target);
|
||||
|
||||
return torrent::Object();
|
||||
}
|
||||
|
||||
+9
-12
@@ -295,8 +295,8 @@ object_to_xmlrpc(xmlrpc_env* env, const torrent::Object& object) {
|
||||
const std::string& str = object.as_string();
|
||||
char buffer[str.size() + 1];
|
||||
char* dst = buffer;
|
||||
for (std::string::const_iterator itr = str.begin(); itr != str.end(); ++itr)
|
||||
*dst++ = ((*itr < 0x20 && *itr != '\r' && *itr != '\n' && *itr != '\t') || (*itr & 0x80)) ? '?' : *itr;
|
||||
for (char itr : str)
|
||||
*dst++ = ((itr < 0x20 && itr != '\r' && itr != '\n' && itr != '\t') || (itr & 0x80)) ? '?' : itr;
|
||||
*dst = 0;
|
||||
|
||||
result = xmlrpc_string_new(env, buffer);
|
||||
@@ -309,8 +309,8 @@ object_to_xmlrpc(xmlrpc_env* env, const torrent::Object& object) {
|
||||
{
|
||||
xmlrpc_value* result = xmlrpc_array_new(env);
|
||||
|
||||
for (torrent::Object::list_const_iterator itr = object.as_list().begin(), last = object.as_list().end(); itr != last; itr++) {
|
||||
xmlrpc_value* item = object_to_xmlrpc(env, *itr);
|
||||
for (const auto& itr : object.as_list()) {
|
||||
xmlrpc_value* item = object_to_xmlrpc(env, itr);
|
||||
xmlrpc_array_append_item(env, result, item);
|
||||
xmlrpc_DECREF(item);
|
||||
}
|
||||
@@ -322,9 +322,9 @@ object_to_xmlrpc(xmlrpc_env* env, const torrent::Object& object) {
|
||||
{
|
||||
xmlrpc_value* result = xmlrpc_struct_new(env);
|
||||
|
||||
for (torrent::Object::map_const_iterator itr = object.as_map().begin(), last = object.as_map().end(); itr != last; itr++) {
|
||||
xmlrpc_value* item = object_to_xmlrpc(env, itr->second);
|
||||
xmlrpc_struct_set_value(env, result, itr->first.c_str(), item);
|
||||
for (const auto& itr : object.as_map()) {
|
||||
xmlrpc_value* item = object_to_xmlrpc(env, itr.second);
|
||||
xmlrpc_struct_set_value(env, result, itr.first.c_str(), item);
|
||||
xmlrpc_DECREF(item);
|
||||
}
|
||||
|
||||
@@ -340,11 +340,8 @@ object_to_xmlrpc(xmlrpc_env* env, const torrent::Object& object) {
|
||||
xmlrpc_DECREF(key_item);
|
||||
|
||||
if (object.as_dict_obj().is_list()) {
|
||||
for (torrent::Object::list_const_iterator
|
||||
itr = object.as_dict_obj().as_list().begin(),
|
||||
last = object.as_dict_obj().as_list().end();
|
||||
itr != last; itr++) {
|
||||
xmlrpc_value* item = object_to_xmlrpc(env, *itr);
|
||||
for (const auto& itr : object.as_dict_obj().as_list()) {
|
||||
xmlrpc_value* item = object_to_xmlrpc(env, itr);
|
||||
xmlrpc_array_append_item(env, result, item);
|
||||
xmlrpc_DECREF(item);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user