2004-11-17 Geoff Norton <gnorton@customerdna.com>

        * Mono.Data.SqliteClient/Sqlite.cs:
          Mono.Data.SqliteClient/SqliteCommand.cs:
          Remove sqlite3Free as this doesn't exist and isn't used by sqlite3.

svn path=/trunk/mcs/; revision=36232

diff --git a/mcs/class/Mono.Data.SqliteClient/ChangeLog b/mcs/class/Mono.Data.SqliteClient/ChangeLog
index 2461308760c80a78e16e446037ea52f22900d874..3a11c6c87618d22e1e3b22f2c80f502d8ea52b7b 100644 (file)
--- a/mcs/class/Mono.Data.SqliteClient/ChangeLog
+++ b/mcs/class/Mono.Data.SqliteClient/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-17  Geoff Norton  <gnorton@customerdna.com>
+
+       * Mono.Data.SqliteClient/Sqlite.cs:
+         Mono.Data.SqliteClient/SqliteCommand.cs:
+         Remove sqlite3Free as this doesn't exist and isn't used by sqlite3.
+
 2004-11-14  Geoff Norton  <gnorton@customerdna.com>
 
        * Mono.Data.SqliteClient/SqliteConnection.cs:  Default to v2 not v3 if version

diff --git a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/Sqlite.cs b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/Sqlite.cs
index 656298d04817398896e9651420b77948e198f185..50f6c5648377c5139e1f0d34f5ddb0217080468e 100644 (file)
--- a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/Sqlite.cs
+++ b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/Sqlite.cs
@@ -146,9 +146,6 @@ namespace Mono.Data.SqliteClient
                [DllImport("sqlite3")]
                internal static extern int sqlite3_last_insert_rowid (IntPtr sqlite_handle);
 
-               [DllImport ("sqlite3")]
-               internal static extern void sqlite3Free (IntPtr ptr);
-               
                [DllImport ("sqlite3")]
                internal static extern SqliteError sqlite3_prepare (IntPtr sqlite_handle, string zSql, int zSqllen, out IntPtr pVm, out IntPtr pzTail);
 

diff --git a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs
index 9688a82995261c1d5437a1cb693992ffae1391ff..0c07f2af17484b6610d5cef92c27fbef98c7e448 100644 (file)
--- a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs
+++ b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs
@@ -247,9 +247,7 @@ namespace Mono.Data.SqliteClient
                        if (err != SqliteError.OK) {
                                if (errMsg != IntPtr.Zero) {
                                        msg = Marshal.PtrToStringAnsi (errMsg);
-                                       if (parent_conn.Version == 3)
-                                               Sqlite.sqlite3Free (errMsg);
-                                       else
+                                       if (parent_conn.Version != 3)
                                                Sqlite.sqliteFree (errMsg);
                                }
                                throw new ApplicationException ("Sqlite error " + msg);