[dovecot-cvs] dovecot/src/lib-sql driver-mysql.c, 1.16.2.4, 1.16.2.5 driver-pgsql.c, 1.10.2.1, 1.10.2.2 driver-sqlite.c, 1.5.2.2, 1.5.2.3 sql-api-private.h, 1.6.2.1, 1.6.2.2 sql-api.c, 1.8.2.1, 1.8.2.2 sql-api.h, 1.8.2.1, 1.8.2.2

[cras at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	driver-mysql.c driver-pgsql.c driver-sqlite.c 
	sql-api-private.h sql-api.c sql-api.h 
Log Message:
sql_escape_string() should return const char *, not char *.



Index: driver-mysql.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/driver-mysql.c,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -d -r1.16.2.4 -r1.16.2.5
--- driver-mysql.c	17 Jun 2006 12:20:20 -0000	1.16.2.4
+++ driver-mysql.c	1 Jul 2006 17:24:11 -0000	1.16.2.5
@@ -343,7 +343,7 @@
 	return 0;
 }
 
-static char *
+static const char *
 driver_mysql_escape_string(struct sql_db *_db, const char *string)
 {
 	struct mysql_db *db = (struct mysql_db *)_db;

Index: driver-pgsql.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/driver-pgsql.c,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- driver-pgsql.c	31 May 2006 11:02:45 -0000	1.10.2.1
+++ driver-pgsql.c	1 Jul 2006 17:24:11 -0000	1.10.2.2
@@ -441,7 +441,8 @@
 	i_error("pgsql: sql_exec() failed: %s", last_error(db));
 }
 
-static char *driver_pgsql_escape_string(struct sql_db *_db, const char *string)
+static const char *
+driver_pgsql_escape_string(struct sql_db *_db, const char *string)
 {
 	struct pgsql_db *db = (struct pgsql_db *)_db;
 	size_t len = strlen(string);

Index: driver-sqlite.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/driver-sqlite.c,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- driver-sqlite.c	27 Jun 2006 09:25:40 -0000	1.5.2.2
+++ driver-sqlite.c	1 Jul 2006 17:24:11 -0000	1.5.2.3
@@ -88,8 +88,9 @@
 	return SQL_DB_FLAG_BLOCKING;
 }
 
-static char *driver_sqlite_escape_string(struct sql_db *_db __attr_unused__,
-					 const char *string)
+static const char *
+driver_sqlite_escape_string(struct sql_db *_db __attr_unused__,
+			    const char *string)
 {
 	const char *p;
 	char *dest, *destbegin;

Index: sql-api-private.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/sql-api-private.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- sql-api-private.h	31 May 2006 11:02:45 -0000	1.6.2.1
+++ sql-api-private.h	1 Jul 2006 17:24:11 -0000	1.6.2.2
@@ -12,7 +12,7 @@
 	enum sql_db_flags (*get_flags)(struct sql_db *db);
 
 	int (*connect)(struct sql_db *db);
-	char *(*escape_string)(struct sql_db *db, const char *string);
+	const char *(*escape_string)(struct sql_db *db, const char *string);
 	void (*exec)(struct sql_db *db, const char *query);
 	void (*query)(struct sql_db *db, const char *query,
 		      sql_query_callback_t *callback, void *context);

Index: sql-api.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/sql-api.c,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- sql-api.c	31 May 2006 11:02:45 -0000	1.8.2.1
+++ sql-api.c	1 Jul 2006 17:24:11 -0000	1.8.2.2
@@ -66,7 +66,7 @@
 	return db->connect(db);
 }
 
-char *sql_escape_string(struct sql_db *db, const char *string)
+const char *sql_escape_string(struct sql_db *db, const char *string)
 {
 	return db->escape_string(db, string);
 }

Index: sql-api.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/sql-api.h,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- sql-api.h	31 May 2006 11:02:45 -0000	1.8.2.1
+++ sql-api.h	1 Jul 2006 17:24:11 -0000	1.8.2.2
@@ -38,7 +38,7 @@
 int sql_connect(struct sql_db *db);
 
 /* Escape the given string if needed and return it. */
-char *sql_escape_string(struct sql_db *db, const char *string);
+const char *sql_escape_string(struct sql_db *db, const char *string);
 
 /* Execute SQL query without waiting for results. */
 void sql_exec(struct sql_db *db, const char *query);