Merge pull request #19 from mapbox/fix-casts

Fix C++ style casts

include/gzip.hpp

@@ -3,7 +3,8 @@
  * gzip implements a standard namespace with a few available functions.
  */
 
-#include "gzip/compress.hpp"
-#include "gzip/decompress.hpp"
-#include "gzip/utils.hpp"
-#include "gzip/version.hpp"
+#include <gzip/compress.hpp>
+#include <gzip/config.hpp>
+#include <gzip/decompress.hpp>
+#include <gzip/utils.hpp>
+#include <gzip/version.hpp>

include/gzip/compress.hpp

@@ -1,9 +1,11 @@
-#include <iostream>
+#include <gzip/config.hpp>
+
 // zlib
 #include <zlib.h>
 // std
 #include <limits>
 #include <stdexcept>
+#include <string>
 
 namespace gzip {
 
@@ -31,7 +33,7 @@ std::string compress(const char* data,
     {
         throw std::runtime_error("deflate init failed");
     }
-    deflate_s.next_in = (Bytef*)data;
+    deflate_s.next_in = reinterpret_cast<z_const Bytef*>(data);
 
 #ifdef DEBUG
     // Verify if size input will fit into unsigned int, type used for zlib's avail_in
@@ -57,7 +59,7 @@ std::string compress(const char* data,
         // There is no way we see that "increase" would not fit in an unsigned int,
         // hence we use static cast here to avoid -Wshorten-64-to-32 error
         deflate_s.avail_out = static_cast<unsigned int>(increase);
-        deflate_s.next_out = (Bytef*)(output.data() + length);
+        deflate_s.next_out = reinterpret_cast<Bytef*>((&output[0] + length));
         // From http://www.zlib.net/zlib_how.html
         // "deflate() has a return value that can indicate errors, yet we do not check it here.
         // Why not? Well, it turns out that deflate() can do no wrong here."

include/gzip/config.hpp

@@ -0,0 +1,5 @@
+#pragma once
+
+#ifndef ZLIB_CONST
+#define ZLIB_CONST
+#endif

include/gzip/decompress.hpp

@@ -1,8 +1,11 @@
+#include <gzip/config.hpp>
+
 // zlib
 #include <zlib.h>
 // std
 #include <limits>
 #include <stdexcept>
+#include <string>
 
 namespace gzip {
 
@@ -25,7 +28,7 @@ std::string decompress(const char* data, std::size_t size)
     {
         throw std::runtime_error("inflate init failed");
     }
-    inflate_s.next_in = (Bytef*)data;
+    inflate_s.next_in = reinterpret_cast<z_const Bytef*>(data);
 
 #ifdef DEBUG
     // Verify if size (long type) input will fit into unsigned int, type used for zlib's avail_in
@@ -47,7 +50,7 @@ std::string decompress(const char* data, std::size_t size)
     {
         output.resize(length + 2 * size);
         inflate_s.avail_out = static_cast<unsigned int>(2 * size);
-        inflate_s.next_out = (Bytef*)(output.data() + length);
+        inflate_s.next_out = reinterpret_cast<Bytef*>(&output[0] + length);
         int ret = inflate(&inflate_s, Z_FINISH);
         if (ret != Z_STREAM_END && ret != Z_OK && ret != Z_BUF_ERROR)
         {

include/gzip/utils.hpp

@@ -1,4 +1,7 @@
+#include <cstdlib>
+
 namespace gzip {
+
 // These live in gzip.hpp because it doesnt need to use deps.
 // Otherwise, they would need to live in impl files if these methods used
 // zlib structures or functions like inflate/deflate)