Remove completed flag from code

Author: etr

src/deferred_response.cpp

@@ -28,16 +28,9 @@ namespace httpserver
 namespace details
 {
 
-MHD_Response* get_raw_response_helper(void* cls, bool completed, ssize_t (*cb)(void*, uint64_t, char*, size_t))
+MHD_Response* get_raw_response_helper(void* cls, ssize_t (*cb)(void*, uint64_t, char*, size_t))
 {
-    if(!completed)
-    {
-        return MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, 1024, cb, cls, NULL);
-    }
-    else
-    {
-        return static_cast<string_response*>(cls)->get_raw_response();
-    }
+    return MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, 1024, cb, cls, NULL);
 }
 
 }

src/httpserver/deferred_response.hpp

@@ -33,7 +33,7 @@ namespace httpserver
 
 namespace details
 {
-    MHD_Response* get_raw_response_helper(void* cls, bool completed, ssize_t (*cb)(void*, uint64_t, char*, size_t));
+    MHD_Response* get_raw_response_helper(void* cls, ssize_t (*cb)(void*, uint64_t, char*, size_t));
 }
 
 template <class T>
@@ -49,24 +49,21 @@ class deferred_response : public string_response
         ):
             string_response(content, response_code, content_type),
             cycle_callback(cycle_callback),
-            closure_data(closure_data),
-            completed(false)
+            closure_data(closure_data)
         {
         }
 
         deferred_response(const deferred_response& other):
             string_response(other),
             cycle_callback(other.cycle_callback),
-            closure_data(other.closure_data),
-            completed(other.completed)
+            closure_data(other.closure_data)
         {
         }
 
         deferred_response(deferred_response&& other) noexcept:
             string_response(std::move(other)),
             cycle_callback(std::move(other.cycle_callback)),
-            closure_data(std::move(other.closure_data)),
-            completed(other.completed)
+            closure_data(std::move(other.closure_data))
         {
         }
 
@@ -77,7 +74,6 @@ class deferred_response : public string_response
             (string_response&) (*this) = b;
             this->cycle_callback = b.cycle_callback;
             this->closure_data = b.closure_data;
-            this->completed = b.completed;
 
             return *this;
         }
@@ -89,7 +85,6 @@ class deferred_response : public string_response
             (string_response&) (*this) = std::move(b);
             this->cycle_callback = std::move(b.cycle_callback);
             this->closure_data = std::move(b.closure_data);
-            this->completed = b.completed;
 
             return *this;
         }
@@ -100,32 +95,17 @@ class deferred_response : public string_response
 
         MHD_Response* get_raw_response()
         {
-            return details::get_raw_response_helper((void*) this, completed, &(this->cb));
-        }
-
-        void decorate_response(MHD_Response* response)
-        {
-            if(completed)
-            {
-                static_cast<string_response*>(this)->decorate_response(response);
-            }
+            return details::get_raw_response_helper((void*) this, &(this->cb));
         }
 
     private:
         ssize_t (*cycle_callback)(std::shared_ptr<T>, char*, size_t);
         std::shared_ptr<T> closure_data;
-        bool completed;
 
         static ssize_t cb(void* cls, uint64_t pos, char* buf, size_t max)
         {
             deferred_response<T>* dfr = static_cast<deferred_response<T>*>(cls);
-            ssize_t val = dfr->cycle_callback(dfr->closure_data, buf, max);
-            if(val == -1)
-            {
-                dfr->completed = true;
-            }
-
-            return val;
+            return dfr->cycle_callback(dfr->closure_data, buf, max);
         }
 };