Merge branch 'master' into refactor/check_apt

1 files changed, 25 insertions, 16 deletions

diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index daae1d54..a82d5a3f 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -26,28 +26,35 @@
  *
  *****************************************************************************/
 
-#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)
-                        printf("looking for [%s] %s [%s]\n", server_expect[i], (flags & NP_MATCH_EXACT) ? "in beginning of" : "anywhere in", status);
+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);
+                }
 
                 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;
@@ -60,10 +67,12 @@ enum np_match_result np_expect_match(char *status, char **server_expect, int exp
                 VERBOSE("couldn't find it");
         }
 
-        if ((flags & NP_MATCH_ALL && match == expect_count) || (!(flags & NP_MATCH_ALL) && match >= 1))
+        if ((flags & NP_MATCH_ALL && match == expect_count) ||
+                (!(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;
 }