1 files changed, 52 insertions, 49 deletions

diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index 23ee4a95..a82d5a3f 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -1,75 +1,78 @@
 /*****************************************************************************
-*
-* Library for check_tcp
-*
-* License: GPL
-* Copyright (c) 1999-2013 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains utilities for check_tcp. These are tested by libtap
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Library for check_tcp
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains utilities for check_tcp. These are tested by libtap
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
-#include "common.h"
+#include "../config.h"
 #include "utils_tcp.h"
+#include <stdio.h>
+#include <string.h>
 
-#define VERBOSE(message)                        \
-        do {                                    \
-                if (flags & NP_MATCH_VERBOSE)   \
-                        puts(message);          \
+#define VERBOSE(message)                                                                           \
+        do {                                                                                           \
+                if (flags & NP_MATCH_VERBOSE)                                                              \
+                        puts(message);                                                                         \
         } while (0)
 
-enum np_match_result
-np_expect_match(char *status, char **server_expect, int expect_count, int flags)
-{
-        int i, match = 0, partial = 0;
-
-        for (i = 0; i < expect_count; i++) {
-                if (flags & NP_MATCH_VERBOSE)
+enum np_match_result np_expect_match(char *status, char **server_expect, int expect_count,
+                                                                         int flags) {
+        int match = 0;
+        int partial = 0;
+        for (int i = 0; i < expect_count; i++) {
+                if (flags & NP_MATCH_VERBOSE) {
                         printf("looking for [%s] %s [%s]\n", server_expect[i],
-                            (flags & NP_MATCH_EXACT) ?
-                            "in beginning of" : "anywhere in",
-                            status);
+                                   (flags & NP_MATCH_EXACT) ? "in beginning of" : "anywhere in", status);
+                }
 
                 if (flags & NP_MATCH_EXACT) {
                         if (strncmp(status, server_expect[i], strlen(server_expect[i])) == 0) {
                                 VERBOSE("found it");
                                 match++;
                                 continue;
-                        } else if (strncmp(status, server_expect[i], strlen(status)) == 0) {
+                        }
+
+                        if (strncmp(status, server_expect[i], strlen(status)) == 0) {
                                 VERBOSE("found a substring");
                                 partial++;
                                 continue;
                         }
                 } else if (strstr(status, server_expect[i]) != NULL) {
-                                VERBOSE("found it");
-                                match++;
-                                continue;
+                        VERBOSE("found it");
+                        match++;
+                        continue;
                 }
                 VERBOSE("couldn't find it");
         }
 
         if ((flags & NP_MATCH_ALL && match == expect_count) ||
-            (!(flags & NP_MATCH_ALL) && match >= 1))
+                (!(flags & NP_MATCH_ALL) && match >= 1)) {
                 return NP_MATCH_SUCCESS;
-        else if (partial > 0 || !(flags & NP_MATCH_EXACT))
+        }
+        if (partial > 0 || !(flags & NP_MATCH_EXACT)) {
                 return NP_MATCH_RETRY;
-        else
-                return NP_MATCH_FAILURE;
+        }
+        return NP_MATCH_FAILURE;
 }