Use nullptr instead of NULL everywhere.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index 2ad9746e7bf2f7cd4c84f8629c26092f22668561..5b74319d71f77645c99b45452b0a677298316901 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -55,7 +55,7 @@ HTTPInput::HTTPInput(const string &url, Input::Encoding encoding)
          num_connection_attempts(0),
          suppress_logging(false)
 {
-       pthread_mutex_init(&stats_mutex, NULL);
+       pthread_mutex_init(&stats_mutex, nullptr);
        stats.url = url;
        stats.bytes_received = 0;
        stats.data_bytes_received = 0;
@@ -89,7 +89,7 @@ HTTPInput::HTTPInput(const InputProto &serialized)
        string protocol, user;
        parse_url(url, &protocol, &user, &host, &port, &path);  // Don't care if it fails.
 
-       pthread_mutex_init(&stats_mutex, NULL);
+       pthread_mutex_init(&stats_mutex, nullptr);
        stats.url = url;
        stats.bytes_received = serialized.bytes_received();
        stats.data_bytes_received = serialized.data_bytes_received();
@@ -97,7 +97,7 @@ HTTPInput::HTTPInput(const InputProto &serialized)
        if (serialized.has_connect_time()) {
                stats.connect_time = serialized.connect_time();
        } else {
-               stats.connect_time = time(NULL);
+               stats.connect_time = time(nullptr);
        }
        if (serialized.has_latency_sec()) {
                stats.latency_sec = serialized.latency_sec();
@@ -151,7 +151,7 @@ InputProto HTTPInput::serialize() const
 int HTTPInput::lookup_and_connect(const string &host, const string &port)
 {
        addrinfo *ai;
-       int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai);
+       int err = getaddrinfo(host.c_str(), port.c_str(), nullptr, &ai);
        if (err != 0) {
                if (!suppress_logging) {
                        log(WARNING, "[%s] Lookup of '%s' failed (%s).",
@@ -194,7 +194,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 
                // Wait for the connect to complete, or an error to happen.
                for ( ;; ) {
-                       bool complete = wait_for_activity(sock, POLLIN | POLLOUT, NULL);
+                       bool complete = wait_for_activity(sock, POLLIN | POLLOUT, nullptr);
                        if (should_stop()) {
                                safe_close(sock);
                                return -1;
@@ -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, "", "");
                        }
 
                        {
@@ -411,7 +406,7 @@ void HTTPInput::do_work()
                                }
 
                                MutexLock lock(&stats_mutex);
-                               stats.connect_time = time(NULL);
+                               stats.connect_time = time(nullptr);
                                clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity);
                        }
                        break;
@@ -479,7 +474,7 @@ void HTTPInput::do_work()
                        if (status == RP_EXTRA_DATA) {
                                char *ptr = static_cast<char *>(
                                        memmem(response.data(), response.size(), "\r\n\r\n", 4));
-                               assert(ptr != NULL);
+                               assert(ptr != nullptr);
                                extra_data = string(ptr + 4, &response[0] + response.size());
                                response.resize(ptr - response.data());
                        }
@@ -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;
        }
@@ -606,7 +601,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                        char *ptr = static_cast<char *>(
                                memmem(pending_data.data(), pending_data.size(),
                                       METACUBE2_SYNC, strlen(METACUBE2_SYNC)));
-                       if (ptr == NULL) {
+                       if (ptr == nullptr) {
                                // OK, so we didn't find the sync marker. We know then that
                                // we do not have the _full_ marker in the buffer, but we
                                // could have N-1 bytes. Drop everything before that,
@@ -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);
                        }
                }