Merge branch 'master' into random-webseeding

1 files changed, 14 insertions, 23 deletions

diff --git a/test/GZipDecoder.cc b/test/GZipDecoder.cc
index 12aab74c..80bac711 100644
--- a/test/GZipDecoder.cc
+++ b/test/GZipDecoder.cc
@@ -40,12 +40,9 @@ namespace aria2 {
 
 const std::string GZipDecoder::NAME("GZipDecoder");
 
-GZipDecoder::GZipDecoder():strm_(nullptr), finished_(false) {}
+GZipDecoder::GZipDecoder() : strm_(nullptr), finished_(false) {}
 
-GZipDecoder::~GZipDecoder()
-{
-  release();
-}
+GZipDecoder::~GZipDecoder() { release(); }
 
 void GZipDecoder::init()
 {
@@ -59,14 +56,14 @@ void GZipDecoder::init()
   strm_->next_in = Z_NULL;
 
   // initalize z_stream with gzip/zlib format auto detection enabled.
-  if(Z_OK != inflateInit2(strm_, 47)) {
+  if (Z_OK != inflateInit2(strm_, 47)) {
     throw DL_ABORT_EX("Initializing z_stream failed.");
   }
 }
 
 void GZipDecoder::release()
 {
-  if(strm_) {
+  if (strm_) {
     inflateEnd(strm_);
     delete strm_;
     strm_ = nullptr;
@@ -77,7 +74,7 @@ std::string GZipDecoder::decode(const unsigned char* in, size_t length)
 {
   std::string out;
 
-  if(length == 0) {
+  if (length == 0) {
     return out;
   }
 
@@ -85,38 +82,32 @@ std::string GZipDecoder::decode(const unsigned char* in, size_t length)
   strm_->next_in = const_cast<unsigned char*>(in);
 
   unsigned char outbuf[OUTBUF_LENGTH];
-  while(1) {
+  while (1) {
     strm_->avail_out = OUTBUF_LENGTH;
     strm_->next_out = outbuf;
 
     int ret = ::inflate(strm_, Z_NO_FLUSH);
 
-    if(ret == Z_STREAM_END) {
+    if (ret == Z_STREAM_END) {
       finished_ = true;
-    } else if(ret != Z_OK) {
-      throw DL_ABORT_EX(fmt("libz::inflate() failed. cause:%s",
-                            strm_->msg));
+    }
+    else if (ret != Z_OK) {
+      throw DL_ABORT_EX(fmt("libz::inflate() failed. cause:%s", strm_->msg));
     }
 
-    size_t produced = OUTBUF_LENGTH-strm_->avail_out;
+    size_t produced = OUTBUF_LENGTH - strm_->avail_out;
 
     out.append(&outbuf[0], &outbuf[produced]);
 
-    if(strm_->avail_out > 0) {
+    if (strm_->avail_out > 0) {
       break;
     }
   }
   return out;
 }
 
-bool GZipDecoder::finished()
-{
-  return finished_;
-}
+bool GZipDecoder::finished() { return finished_; }
 
-const std::string& GZipDecoder::getName() const
-{
-  return NAME;
-}
+const std::string& GZipDecoder::getName() const { return NAME; }
 
 } // namespace aria2