When warning about unusually long Metacube blocks, use decimal instead of hex.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index c346a1423ebbe938e4ee3bb7f6dfe49011bb005a..e22e0a5970a25f3bc628ed77a6ff561f5620ad9f 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -352,7 +352,7 @@ void HTTPInput::do_work()
                                char *ptr = static_cast<char *>(
                                        memmem(response.data(), response.size(), "\r\n\r\n", 4));
                                assert(ptr != NULL);
-                               extra_data = string(ptr, &response[0] + response.size());
+                               extra_data = string(ptr + 4, &response[0] + response.size());
                                response.resize(ptr - response.data());
                        }
 
@@ -459,7 +459,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                uint32_t flags = ntohl(hdr->flags);
 
                if (size > 65535) {
-                       log(WARNING, "[%s] Metacube block of %x bytes (flags=%x); corrupted header?",
+                       log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?",
                                url.c_str(), size, flags);
                }