[dovecot-cvs] dovecot/src/lib-sql driver-mysql.c, 1.11, 1.12 driver-pgsql.c, 1.6, 1.7

cras at dovecot.org cras at dovecot.org
Fri Jan 13 22:26:28 EET 2006


Update of /var/lib/cvs/dovecot/src/lib-sql
In directory talvi:/tmp/cvs-serv27808/src/lib-sql

Modified Files:
	driver-mysql.c driver-pgsql.c 
Log Message:
Added "bool" type and changed all ints that were used as booleans to bool.



Index: driver-mysql.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/driver-mysql.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- driver-mysql.c	10 Dec 2005 21:10:48 -0000	1.11
+++ driver-mysql.c	13 Jan 2006 20:26:24 -0000	1.12
@@ -71,12 +71,12 @@
 extern struct sql_result driver_mysql_result;
 extern struct sql_result driver_mysql_error_result;
 
-static int driver_mysql_connect(struct mysql_connection *conn)
+static bool driver_mysql_connect(struct mysql_connection *conn)
 {
 	struct mysql_db *db = conn->db;
 	const char *unix_socket, *host;
 	time_t now;
-	int failed;
+	bool failed;
 
 	if (conn->connected)
 		return TRUE;
@@ -302,8 +302,9 @@
 {
 	struct mysql_connection *conn;
 	size_t size;
-	int reset, ret;
 	unsigned int i, start;
+	bool reset;
+	int ret;
 
 	conn = buffer_get_modifyable_data(db->connections, &size);
 	size /= sizeof(*conn);
@@ -313,7 +314,7 @@
 	start = db->next_query_connection % size;
 	db->next_query_connection++;
 
-	for (reset = 0;; reset++) {
+	for (reset = FALSE;; reset = TRUE) {
 		i = start;
 		do {
 			ret = driver_mysql_connection_do_query(&conn[i], query);

Index: driver-pgsql.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/driver-pgsql.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- driver-pgsql.c	11 Jan 2006 21:45:56 -0000	1.6
+++ driver-pgsql.c	13 Jan 2006 20:26:24 -0000	1.7
@@ -251,7 +251,7 @@
 static void result_finish(struct pgsql_result *result)
 {
 	struct pgsql_db *db = (struct pgsql_db *)result->api.db;
-	int free_result = TRUE;
+	bool free_result = TRUE;
 
 	if (result->callback != NULL) {
 		result->api.callback = TRUE;



More information about the dovecot-cvs mailing list