From: Timo Sirainen Date: Mon, 3 May 2010 15:15:15 +0000 (+0300) Subject: lib-sql: Make driver structs const. X-Git-Tag: 2.0.beta5~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0db5b158a00c08955bdacc99b1e2cd1ec07f4311;p=thirdparty%2Fdovecot%2Fcore.git lib-sql: Make driver structs const. --HG-- branch : HEAD --- diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c index 9a46630198..3fcbcae9a3 100644 --- a/src/lib-sql/driver-mysql.c +++ b/src/lib-sql/driver-mysql.c @@ -80,9 +80,9 @@ struct mysql_query_list { unsigned int *affected_rows; }; -extern struct sql_db driver_mysql_db; -extern struct sql_result driver_mysql_result; -extern struct sql_result driver_mysql_error_result; +extern const struct sql_db driver_mysql_db; +extern const struct sql_result driver_mysql_result; +extern const struct sql_result driver_mysql_error_result; static bool driver_mysql_connect(struct mysql_connection *conn) { @@ -692,7 +692,7 @@ driver_mysql_update(struct sql_transaction_context *_ctx, const char *query, ctx->tail = list; } -struct sql_db driver_mysql_db = { +const struct sql_db driver_mysql_db = { "mysql", .v = { @@ -714,7 +714,7 @@ struct sql_db driver_mysql_db = { } }; -struct sql_result driver_mysql_result = { +const struct sql_result driver_mysql_result = { .v = { driver_mysql_result_free, driver_mysql_result_next_row, @@ -735,7 +735,7 @@ driver_mysql_result_error_next_row(struct sql_result *result ATTR_UNUSED) return -1; } -struct sql_result driver_mysql_error_result = { +const struct sql_result driver_mysql_error_result = { .v = { driver_mysql_result_free, driver_mysql_result_error_next_row, diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c index fdcc936de0..ef25888fa2 100644 --- a/src/lib-sql/driver-pgsql.c +++ b/src/lib-sql/driver-pgsql.c @@ -91,8 +91,8 @@ struct pgsql_query_list { const char *query; unsigned int *affected_rows; }; -extern struct sql_db driver_pgsql_db; -extern struct sql_result driver_pgsql_result; +extern const struct sql_db driver_pgsql_db; +extern const struct sql_result driver_pgsql_result; static void driver_pgsql_query_full(struct sql_db *db, const char *query, @@ -1068,7 +1068,7 @@ driver_pgsql_update(struct sql_transaction_context *_ctx, const char *query, ctx->tail = list; } -struct sql_db driver_pgsql_db = { +const struct sql_db driver_pgsql_db = { "pgsql", .v = { @@ -1090,7 +1090,7 @@ struct sql_db driver_pgsql_db = { } }; -struct sql_result driver_pgsql_result = { +const struct sql_result driver_pgsql_result = { .v = { driver_pgsql_result_free, driver_pgsql_result_next_row, diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c index 53c055f675..d631c15b97 100644 --- a/src/lib-sql/driver-sqlite.c +++ b/src/lib-sql/driver-sqlite.c @@ -33,9 +33,9 @@ struct sqlite_transaction_context { unsigned int failed:1; }; -extern struct sql_db driver_sqlite_db; -extern struct sql_result driver_sqlite_result; -extern struct sql_result driver_sqlite_error_result; +extern const struct sql_db driver_sqlite_db; +extern const struct sql_result driver_sqlite_result; +extern const struct sql_result driver_sqlite_error_result; static int driver_sqlite_connect(struct sql_db *_db) { @@ -386,7 +386,7 @@ driver_sqlite_update(struct sql_transaction_context *_ctx, const char *query, *affected_rows = sqlite3_changes(db->sqlite); } -struct sql_db driver_sqlite_db = { +const struct sql_db driver_sqlite_db = { "sqlite", .v = { @@ -407,7 +407,7 @@ struct sql_db driver_sqlite_db = { } }; -struct sql_result driver_sqlite_result = { +const struct sql_result driver_sqlite_result = { .v = { driver_sqlite_result_free, driver_sqlite_result_next_row, @@ -428,7 +428,7 @@ driver_sqlite_result_error_next_row(struct sql_result *result ATTR_UNUSED) return -1; } -struct sql_result driver_sqlite_error_result = { +const struct sql_result driver_sqlite_error_result = { .v = { driver_sqlite_result_free, driver_sqlite_result_error_next_row,