From: Michael Wallner <mike@php.net>
Date: Mon, 6 Jan 2020 11:22:19 +0000 (+0100)
Subject: c++: fix incompatible types
X-Git-Tag: pre_cmake~89
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=dc1e22ba362663bf052e7cfbbdf933bb462a7006;p=m6w6%2Flibmemcached

c++: fix incompatible types
---

diff --git a/clients/memflush.cc b/clients/memflush.cc
index 8bd0dbf5..71545eab 100644
--- a/clients/memflush.cc
+++ b/clients/memflush.cc
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
 {
   options_parse(argc, argv);
 
-  if (opt_servers == false)
+  if (opt_servers == NULL)
   {
     char *temp;
 
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
       opt_servers= strdup(temp);
     }
 
-    if (opt_servers == false)
+    if (opt_servers == NULL)
     {
       std::cerr << "No Servers provided" << std::endl;
       exit(EXIT_FAILURE);
diff --git a/clients/memstat.cc b/clients/memstat.cc
index 793aab9b..e5bac916 100644
--- a/clients/memstat.cc
+++ b/clients/memstat.cc
@@ -426,7 +426,7 @@ static void options_parse(int argc, char *argv[])
       break;
 
     case OPT_ANALYZE: /* --analyze or -a */
-      opt_analyze= OPT_ANALYZE;
+      opt_analyze= true;
       analyze_mode= (optarg) ? strdup(optarg) : NULL;
       break;