From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 1 Jul 2011 18:20:57 +0000 (+0200)
Subject: sqlite3: Rename sqlite3_callback parameter to callback
X-Git-Tag: 0.13.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d620ca3670aa413a5964da596dffd8781b4e814;p=thirdparty%2Fvala.git

sqlite3: Rename sqlite3_callback parameter to callback

Avoid possible conflicts with the C type sqlite3_callback.
---

diff --git a/vapi/sqlite3.vapi b/vapi/sqlite3.vapi
index 2188053dd..f4eaf0f9b 100644
--- a/vapi/sqlite3.vapi
+++ b/vapi/sqlite3.vapi
@@ -29,11 +29,11 @@ namespace Sqlite {
 		public int busy_timeout (int ms);
 		public int changes ();
 		[CCode (cname = "sqlite3_exec")]
-		public int _exec (string sql, Callback? sqlite3_callback = null, [CCode (type = "char**")] out unowned string errmsg = null);
+		public int _exec (string sql, Callback? callback = null, [CCode (type = "char**")] out unowned string errmsg = null);
 		[CCode (cname = "_sqlite3_exec")]
-		public int exec (string sql, Callback? sqlite3_callback = null, out string errmsg = null) {
+		public int exec (string sql, Callback? callback = null, out string errmsg = null) {
 			unowned string sqlite_errmsg;
-			var ec = this._exec (sql, sqlite3_callback, out sqlite_errmsg);
+			var ec = this._exec (sql, callback, out sqlite_errmsg);
 			if (&errmsg != null) {
 				errmsg = sqlite_errmsg;
 			}