From 53b2dadfcebb35cbb1a9f72dbf2216a568f846b3 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 19 Apr 2018 15:59:42 +0200
Subject: [PATCH] Compile without warning.

---
 meson.build                | 2 +-
 src/reader/kiwix-read.cpp  | 9 ---------
 src/server/kiwix-serve.cpp | 6 +++---
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/meson.build b/meson.build
index af6eb97..88b2fe9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('kiwix-tools', 'cpp',
   version : '0.4.0',
   license : 'GPL',
-  default_options: ['c_std=c11', 'cpp_std=c++11'])
+  default_options: ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
 
 compiler = meson.get_compiler('cpp')
 
diff --git a/src/reader/kiwix-read.cpp b/src/reader/kiwix-read.cpp
index 7b8761c..4025bbb 100644
--- a/src/reader/kiwix-read.cpp
+++ b/src/reader/kiwix-read.cpp
@@ -79,10 +79,8 @@ int main(int argc, char** argv)
 
   /* Start to read an article */
   if (reader != NULL) {
-    string mainPageUrl = reader->getMainPageUrl();
     string content;
     string contentType;
-    unsigned int contentLength = 0;
     string suggestion;
 
     if (pattern != NULL) {
@@ -94,13 +92,6 @@ int main(int argc, char** argv)
       }
     }
 
-    /*
-    if (reader->getContentByUrl(mainPageUrl, content, contentLength,
-    contentType)) {
-      cout << content << endl;
-    }
-    */
-
     delete reader;
   } else {
     cerr << "Unable instanciate the Kiwix reader." << endl;
diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index eeb56dd..b0706f3 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -218,8 +218,8 @@ static struct MHD_Response* build_response(const void* data,
                                            bool cacheEnabled)
 {
   /* Create the response */
-  struct MHD_Response* response = MHD_create_response_from_data(
-      length, const_cast<void*>(data), MHD_NO, MHD_YES);
+  struct MHD_Response* response = MHD_create_response_from_buffer(
+      length, const_cast<void*>(data), MHD_RESPMEM_MUST_COPY);
 
   /* Make a redirection if necessary otherwise send the content */
   if (!httpRedirection.empty()) {
@@ -784,7 +784,7 @@ int main(int argc, char** argv)
   string rootPath;
   string interface;
   int serverPort = 80;
-  int daemonFlag = false;
+  int daemonFlag [[gnu::unused]] = false;
   int libraryFlag = false;
   string PPIDString;
   unsigned int PPID = 0;