Merge branch 'master' into check_swap_again

1 files changed, 4 insertions, 7 deletions

diff --git a/lib/utils_tcp.h b/lib/utils_tcp.h
index 0328a9cf..d5999e9b 100644
--- a/lib/utils_tcp.h
+++ b/lib/utils_tcp.h
@@ -1,8 +1,8 @@
 /* Header file for utils_tcp */
 
-#define NP_MATCH_ALL            0x1
-#define NP_MATCH_EXACT          0x2
-#define NP_MATCH_VERBOSE        0x4
+#define NP_MATCH_ALL     0x1
+#define NP_MATCH_EXACT   0x2
+#define NP_MATCH_VERBOSE 0x4
 
 /*
  * The NP_MATCH_RETRY state indicates that matching might succeed if
@@ -16,7 +16,4 @@ enum np_match_result {
         NP_MATCH_RETRY
 };
 
-enum np_match_result np_expect_match(char *status,
-                                     char **server_expect,
-                                     int server_expect_count,
-                                     int flags);
+enum np_match_result np_expect_match(char *status, char **server_expect, int server_expect_count, int flags);