From 49eb124cb6213190fe504b2004ab7ca12ee89e1a Mon Sep 17 00:00:00 2001
From: Frediano Ziglio <freddy77@gmail.com>
Date: Sun, 8 Dec 2024 19:42:54 +0000
Subject: [PATCH] odbc: Use bool for condition in test parser

Just style change.

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
---
 src/odbc/unittests/data.c        |  2 +-
 src/odbc/unittests/describecol.c |  2 +-
 src/odbc/unittests/parser.c      | 30 ++++++++++++++----------------
 src/odbc/unittests/parser.h      |  4 ++--
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/odbc/unittests/data.c b/src/odbc/unittests/data.c
index a2dd42f72..7ff763d71 100644
--- a/src/odbc/unittests/data.c
+++ b/src/odbc/unittests/data.c
@@ -98,7 +98,7 @@ lookup(const char *name, const struct odbc_lookup_int *table)
 int
 main(void)
 {
-	int cond = 1;
+	bool cond = true;
 
 #define TEST_FILE "data.in"
 	const char *in_file = FREETDS_SRCDIR "/" TEST_FILE;
diff --git a/src/odbc/unittests/describecol.c b/src/odbc/unittests/describecol.c
index b602403e0..bbb84e975 100644
--- a/src/odbc/unittests/describecol.c
+++ b/src/odbc/unittests/describecol.c
@@ -294,7 +294,7 @@ check_attr_none(ATTR_PARAMS)
 int
 main(void)
 {
-	int cond = 1;
+	bool cond = true;
 #define TEST_FILE "describecol.in"
 	const char *in_file = FREETDS_SRCDIR "/" TEST_FILE;
 	FILE *f;
diff --git a/src/odbc/unittests/parser.c b/src/odbc/unittests/parser.c
index 9a90869b4..8b0fbe639 100644
--- a/src/odbc/unittests/parser.c
+++ b/src/odbc/unittests/parser.c
@@ -99,15 +99,14 @@ odbc_get_str(char **p)
 enum { MAX_BOOLS = 64 };
 typedef struct {
 	char *name;
-	int value;
+	bool value;
 } bool_t;
 static bool_t bools[MAX_BOOLS];
 
 void
-odbc_set_bool(const char *name, int value)
+odbc_set_bool(const char *name, bool value)
 {
 	unsigned n;
-	value = !!value;
 	for (n = 0; n < MAX_BOOLS && bools[n].name; ++n)
 		if (!strcmp(bools[n].name, name)) {
 			bools[n].value = value;
@@ -121,7 +120,7 @@ odbc_set_bool(const char *name, int value)
 	bools[n].value = value;
 }
 
-static int
+static bool
 get_bool(const char *name)
 {
 	unsigned n;
@@ -132,7 +131,7 @@ get_bool(const char *name)
 			return bools[n].value;
 
 	odbc_fatal(": boolean variable %s not found\n", name);
-	return 0;
+	return false;
 }
 
 /** initialize booleans, call after connection */
@@ -160,10 +159,10 @@ odbc_clear_bools(void)
 }
 
 enum { MAX_CONDITIONS = 32 };
-static char conds[MAX_CONDITIONS];
+static bool conds[MAX_CONDITIONS];
 static unsigned cond_level = 0;
 
-static int
+static bool
 pop_condition(void)
 {
 	if (cond_level == 0) odbc_fatal(": no related if\n");
@@ -171,17 +170,16 @@ pop_condition(void)
 }
 
 static void
-push_condition(int cond)
+push_condition(bool cond)
 {
-	if (cond != 0 && cond != 1) odbc_fatal(": invalid cond value %d\n", cond);
 	if (cond_level >= MAX_CONDITIONS) odbc_fatal(": too much nested conditions\n");
 	conds[cond_level++] = cond;
 }
 
-static int
+static bool
 get_not_cond(char **p)
 {
-	int cond;
+	bool cond;
 	const char *tok = odbc_get_tok(p);
 	if (!tok) odbc_fatal(": wrong condition syntax\n");
 
@@ -193,10 +191,10 @@ get_not_cond(char **p)
 	return cond;
 }
 
-static int
+static bool
 get_condition(char **p)
 {
-	int cond1 = get_not_cond(p), cond2;
+	bool cond1 = get_not_cond(p), cond2;
 	const char *tok;
 
 	while ((tok=odbc_get_tok(p)) != NULL) {
@@ -226,7 +224,7 @@ odbc_init_parser(FILE *f)
 }
 
 const char *
-odbc_get_cmd_line(char **p_s, int *cond)
+odbc_get_cmd_line(char **p_s, bool *cond)
 {
 	while (fgets(line_buf, sizeof(line_buf), parse_file)) {
 		char *p = line_buf;
@@ -242,7 +240,7 @@ odbc_get_cmd_line(char **p_s, int *cond)
 
 		/* conditional statement */
 		if (!strcmp(cmd, "else")) {
-			int c = pop_condition();
+			bool c = pop_condition();
 			push_condition(c);
 			*cond = c && !*cond;
 			continue;
@@ -264,7 +262,7 @@ odbc_get_cmd_line(char **p_s, int *cond)
 			const char *s_ver = odbc_get_tok(&p);
 			int ver = odbc_tds_version();
 			int expected;
-			int res;
+			bool res;
 			unsigned M, m;
 
 			if (!cmp || !s_ver)
diff --git a/src/odbc/unittests/parser.h b/src/odbc/unittests/parser.h
index 20364ffb9..a9e6ad7bd 100644
--- a/src/odbc/unittests/parser.h
+++ b/src/odbc/unittests/parser.h
@@ -11,11 +11,11 @@ void odbc_fatal(const char *msg, ...)
 const char *odbc_get_tok(char **p);
 const char *odbc_get_str(char **p);
 
-void odbc_set_bool(const char *name, int value);
+void odbc_set_bool(const char *name, bool value);
 void odbc_init_bools(void);
 void odbc_clear_bools(void);
 
 void odbc_init_parser(FILE *f);
-const char *odbc_get_cmd_line(char **p, int *cond);
+const char *odbc_get_cmd_line(char **p, bool *cond);
 
 #include <freetds/popvis.h>