Mercurial > dovecot > original-hg > dovecot-1.2
changeset 4458:3e196acd60b7 HEAD
sql_escape_string() should return const char *, not char *.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 01 Jul 2006 20:24:11 +0300 |
| parents | fa7353daa44f |
| children | de5163f16d8c |
| files | src/lib-sql/driver-mysql.c src/lib-sql/driver-pgsql.c src/lib-sql/driver-sqlite.c src/lib-sql/sql-api-private.h src/lib-sql/sql-api.c src/lib-sql/sql-api.h |
| diffstat | 6 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-sql/driver-mysql.c Fri Jun 30 17:49:03 2006 +0300 +++ b/src/lib-sql/driver-mysql.c Sat Jul 01 20:24:11 2006 +0300 @@ -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;
--- a/src/lib-sql/driver-pgsql.c Fri Jun 30 17:49:03 2006 +0300 +++ b/src/lib-sql/driver-pgsql.c Sat Jul 01 20:24:11 2006 +0300 @@ -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);
--- a/src/lib-sql/driver-sqlite.c Fri Jun 30 17:49:03 2006 +0300 +++ b/src/lib-sql/driver-sqlite.c Sat Jul 01 20:24:11 2006 +0300 @@ -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;
--- a/src/lib-sql/sql-api-private.h Fri Jun 30 17:49:03 2006 +0300 +++ b/src/lib-sql/sql-api-private.h Sat Jul 01 20:24:11 2006 +0300 @@ -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);
--- a/src/lib-sql/sql-api.c Fri Jun 30 17:49:03 2006 +0300 +++ b/src/lib-sql/sql-api.c Sat Jul 01 20:24:11 2006 +0300 @@ -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); }
--- a/src/lib-sql/sql-api.h Fri Jun 30 17:49:03 2006 +0300 +++ b/src/lib-sql/sql-api.h Sat Jul 01 20:24:11 2006 +0300 @@ -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);