Use C++11 range-based for loops and auto wherever it makes sense.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index 2ad9746e7bf2f7cd4c84f8629c26092f22668561..c0cfc03bbe6d619bb152aa7a7e265b3d76fef10d 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -264,8 +264,7 @@ bool HTTPInput::parse_response(const string &request)
 
        // Remove “Content-encoding: metacube”.
        // TODO: Make case-insensitive.
-       multimap<string, string>::iterator encoding_it =
-               parameters.find("Content-encoding");
+       const auto encoding_it = parameters.find("Content-encoding");
        if (encoding_it != parameters.end() && encoding_it->second == "metacube") {
                parameters.erase(encoding_it);
        }
@@ -276,13 +275,11 @@ bool HTTPInput::parse_response(const string &request)
        if (parameters.count("Server") == 0) {
                parameters.insert(make_pair("Server", SERVER_IDENTIFICATION));
        } else {
-               for (multimap<string, string>::iterator it = parameters.begin();
-                    it != parameters.end();
-                    ++it) {
-                       if (it->first != "Server") {
+               for (auto &key_and_value : parameters) {
+                       if (key_and_value.first != "Server") {
                                continue;
                        }
-                       it->second = SERVER_IDENTIFICATION " (reflecting: " + it->second + ")";
+                       key_and_value.second = SERVER_IDENTIFICATION " (reflecting: " + key_and_value.second + ")";
                }
        }
 
@@ -293,14 +290,12 @@ bool HTTPInput::parse_response(const string &request)
 
        // Construct the new HTTP header.
        http_header = "HTTP/1.0 200 OK\r\n";
-       for (multimap<string, string>::iterator it = parameters.begin();
-            it != parameters.end();
-            ++it) {
-               http_header.append(it->first + ": " + it->second + "\r\n");
+       for (const auto &key_and_value : parameters) {
+               http_header.append(key_and_value.first + ": " + key_and_value.second + "\r\n");
        }
 
-       for (size_t i = 0; i < stream_indices.size(); ++i) {
-               servers->set_header(stream_indices[i], http_header, stream_header);
+       for (int stream_index : stream_indices) {
+               servers->set_header(stream_index, http_header, stream_header);
        }
 
        return true;
@@ -358,8 +353,8 @@ void HTTPInput::do_work()
                        response.clear();
                        pending_data.clear();
                        has_metacube_header = false;
-                       for (size_t i = 0; i < stream_indices.size(); ++i) {
-                               servers->set_header(stream_indices[i], "", "");
+                       for (int stream_index : stream_indices) {
+                               servers->set_header(stream_index, "", "");
                        }
 
                        {
@@ -585,8 +580,8 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
        }
 
        if (encoding == Input::INPUT_ENCODING_RAW) {
-               for (size_t i = 0; i < stream_indices.size(); ++i) {
-                       servers->add_data(stream_indices[i], ptr, bytes, /*metacube_flags=*/0);
+               for (int stream_index : stream_indices) {
+                       servers->add_data(stream_index, ptr, bytes, /*metacube_flags=*/0);
                }
                return;
        }
@@ -672,12 +667,12 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                        char *inner_data = pending_data.data() + sizeof(metacube2_block_header);
                        if (flags & METACUBE_FLAGS_HEADER) {
                                stream_header = string(inner_data, inner_data + size);
-                               for (size_t i = 0; i < stream_indices.size(); ++i) {
-                                       servers->set_header(stream_indices[i], http_header, stream_header);
+                               for (int stream_index : stream_indices) {
+                                       servers->set_header(stream_index, http_header, stream_header);
                                }
                        }
-                       for (size_t i = 0; i < stream_indices.size(); ++i) {
-                               servers->add_data(stream_indices[i], inner_data, size, flags);
+                       for (int stream_index : stream_indices) {
+                               servers->add_data(stream_index, inner_data, size, flags);
                        }
                }