Fix several compiler warnings

pornography-protection · Apr 3, 2024 · 133db34 · 133db34
1 parent c6144a6
commit 133db34
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/ICAPHeader.cpp b/src/ICAPHeader.cpp
@@ -545,9 +545,10 @@ bool ICAPHeader::in(Socket *sock, bool allowpersistent)
             if (is_response) {
                 if (!(line.length() > 11 && line.startsWith("ICAP/") &&
                       (line.after(" ").before(" ").toInteger() > 99))) {
-                    if (o.conn.logconerror)
+                    if (o.conn.logconerror) {
                         E2LOGGER_error("Server did not respond with ICAP");
-                        DEBUG_icap("Returning from header:in Server did not respond with ICAP length: ", line.length(), " content: ", line );
+                    }
+                    DEBUG_icap("Returning from header:in Server did not respond with ICAP length: ", line.length(), " content: ", line );
                     return false;
                 }
             } else {

diff --git a/src/ListContainer.cpp b/src/ListContainer.cpp
@@ -822,7 +822,7 @@ bool ListContainer::findEndsWith(const char *string, String &lastcategory, Strin
             if (r >= 0) {
                 lastcategory = category;
                 match = (data + list[r]);
-                return (data + list[r]);
+                return true;
             }
         }
         bool rc;
@@ -833,7 +833,7 @@ bool ListContainer::findEndsWith(const char *string, String &lastcategory, Strin
             }
         }
     }
-    return NULL;
+    return false;
 }
 
 // For phrase lists - grab the text, score and type of a given phrase, based on item number within list