[vtk7] 17/24: correct sqlite patch
Gert Wollny
gewo at moszumanska.debian.org
Sun Jul 9 08:00:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository vtk7.
commit 3b8a3e0c1680587492023fd8adeaa388c814a8b8
Author: Gert Wollny <gewo at debian.org>
Date: Sat Jul 8 16:16:35 2017 +0000
correct sqlite patch
---
debian/patches/40_use_system_sqlite.patch | 110 +++++++++++++++---------------
1 file changed, 55 insertions(+), 55 deletions(-)
diff --git a/debian/patches/40_use_system_sqlite.patch b/debian/patches/40_use_system_sqlite.patch
index 8b41d9c..6afcd63 100644
--- a/debian/patches/40_use_system_sqlite.patch
+++ b/debian/patches/40_use_system_sqlite.patch
@@ -19,7 +19,7 @@ Last-Update: 2014-06-03
}
- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
-+ int result = sqlite_open(this->DatabaseFileName, & (this->SQLiteInstance));
++ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
- if (result != VTK_SQLITE_OK)
+ if (result != SQLITE_OK)
@@ -27,10 +27,10 @@ Last-Update: 2014-06-03
vtkDebugMacro(<<"SQLite open() failed. Error code is "
<< result << " and message is "
- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
-+ << sqlite_errmsg(this->SQLiteInstance) );
++ << sqlite3_errmsg(this->SQLiteInstance) );
- vtk_sqlite3_close(this->SQLiteInstance);
-+ sqlite_close(this->SQLiteInstance);
++ sqlite3_close(this->SQLiteInstance);
return false;
}
else
@@ -40,7 +40,7 @@ Last-Update: 2014-06-03
{
- int result = vtk_sqlite3_close(this->SQLiteInstance);
- if (result != VTK_SQLITE_OK)
-+ int result = sqlite_close(this->SQLiteInstance);
++ int result = sqlite3_close(this->SQLiteInstance);
+ if (result != SQLITE_OK)
{
vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
@@ -121,7 +121,7 @@ Last-Update: 2014-06-03
if (this->Database != NULL)
{
- vtk_sqlite3_finalize(this->Statement);
-+ sqlite_finalize(this->Statement);
++ sqlite3_finalize(this->Statement);
this->Statement = NULL;
}
}
@@ -131,7 +131,7 @@ Last-Update: 2014-06-03
vtkDebugMacro(<<"Finalizing old statement");
- int finalizeStatus = vtk_sqlite3_finalize(this->Statement);
- if (finalizeStatus != VTK_SQLITE_OK)
-+ int finalizeStatus = sqlite_finalize(this->Statement);
++ int finalizeStatus = sqlite3_finalize(this->Statement);
+ if (finalizeStatus != SQLITE_OK)
{
vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
@@ -141,11 +141,11 @@ Last-Update: 2014-06-03
}
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
const char *unused_statement;
- int prepareStatus = vtk_sqlite3_prepare_v2(db,
-+ int prepareStatus = sqlite_prepare_v2(db,
++ int prepareStatus = sqlite3_prepare_v2(db,
this->Query,
static_cast<int>(strlen(this->Query)),
&this->Statement,
@@ -156,8 +156,8 @@ Last-Update: 2014-06-03
{
- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message "
-+ this->SetLastErrorText(sqlite_errmsg(db));
-+ vtkWarningMacro(<<"SetQuery(): sqlite_prepare_v2() failed with error message "
++ this->SetLastErrorText(sqlite3_errmsg(db));
++ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message "
<< this->GetLastErrorText()
<< " on statement: '"
<< this->Query << "'");
@@ -166,14 +166,14 @@ Last-Update: 2014-06-03
else
{
- vtk_sqlite3_reset(this->Statement);
-+ sqlite_reset(this->Statement);
++ sqlite3_reset(this->Statement);
}
vtkDebugMacro(<<"Execute(): Query ready to execute.");
this->InitialFetch = true;
- int result = vtk_sqlite3_step(this->Statement);
-+ int result = sqlite_step(this->Statement);
++ int result = sqlite3_step(this->Statement);
this->InitialFetchResult = result;
- if (result == VTK_SQLITE_DONE)
@@ -191,12 +191,12 @@ Last-Update: 2014-06-03
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message "
-+ this->SetLastErrorText(sqlite_errmsg(db));
-+ vtkDebugMacro(<< "Execute(): sqlite_step() returned error message "
++ this->SetLastErrorText(sqlite3_errmsg(db));
++ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message "
<< this->GetLastErrorText());
this->Active = false;
return false;
@@ -205,7 +205,7 @@ Last-Update: 2014-06-03
else
{
- return vtk_sqlite3_column_count(this->Statement);
-+ return sqlite_column_count(this->Statement);
++ return sqlite3_column_count(this->Statement);
}
}
@@ -214,7 +214,7 @@ Last-Update: 2014-06-03
else
{
- return vtk_sqlite3_column_name(this->Statement, column);
-+ return sqlite_column_name(this->Statement, column);
++ return sqlite3_column_name(this->Statement, column);
}
}
@@ -223,7 +223,7 @@ Last-Update: 2014-06-03
else
{
- switch (vtk_sqlite3_column_type(this->Statement, column))
-+ switch (sqlite_column_type(this->Statement, column))
++ switch (sqlite3_column_type(this->Statement, column))
{
- case VTK_SQLITE_INTEGER:
+ case SQLITE_INTEGER:
@@ -244,7 +244,7 @@ Last-Update: 2014-06-03
{
vtkErrorMacro(<<"GetFieldType(): Unknown data type "
- << vtk_sqlite3_column_type(this->Statement, column)
-+ << sqlite_column_type(this->Statement, column)
++ << sqlite3_column_type(this->Statement, column)
<<" from SQLite.");
return VTK_VOID;
}
@@ -263,7 +263,7 @@ Last-Update: 2014-06-03
{
- int result = vtk_sqlite3_step(this->Statement);
- if (result == VTK_SQLITE_DONE)
-+ int result = sqlite_step(this->Statement);
++ int result = sqlite3_step(this->Statement);
+ if (result == SQLITE_DONE)
{
return false;
@@ -289,24 +289,24 @@ Last-Update: 2014-06-03
else
{
- switch (vtk_sqlite3_column_type(this->Statement, column))
-+ switch (sqlite_column_type(this->Statement, column))
++ switch (sqlite3_column_type(this->Statement, column))
{
- case VTK_SQLITE_INTEGER:
- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column));
+ case SQLITE_INTEGER:
-+ return vtkVariant(sqlite_column_int(this->Statement, column));
++ return vtkVariant(sqlite3_column_int(this->Statement, column));
- case VTK_SQLITE_FLOAT:
- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column));
+ case SQLITE_FLOAT:
-+ return vtkVariant(sqlite_column_double(this->Statement, column));
++ return vtkVariant(sqlite3_column_double(this->Statement, column));
- case VTK_SQLITE_TEXT:
+ case SQLITE_TEXT:
{
std::ostringstream str;
- str << vtk_sqlite3_column_text(this->Statement, column);
-+ str << sqlite_column_text(this->Statement, column);
++ str << sqlite3_column_text(this->Statement, column);
return vtkVariant(vtkStdString(str.str()));
}
@@ -320,8 +320,8 @@ Last-Update: 2014-06-03
return vtkVariant(vtkStdString(
- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)),
- vtk_sqlite3_column_bytes(this->Statement, column)));
-+ static_cast<const char*>(sqlite_column_blob(this->Statement, column)),
-+ sqlite_column_bytes(this->Statement, column)));
++ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)),
++ sqlite3_column_bytes(this->Statement, column)));
}
- case VTK_SQLITE_NULL:
@@ -334,10 +334,10 @@ Last-Update: 2014-06-03
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
-+ int result = sqlite_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
@@ -349,7 +349,7 @@ Last-Update: 2014-06-03
if (this->Statement)
{
- vtk_sqlite3_finalize(this->Statement);
-+ sqlite_finalize(this->Statement);
++ sqlite3_finalize(this->Statement);
this->Statement = NULL;
}
@@ -358,10 +358,10 @@ Last-Update: 2014-06-03
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
-+ int result = sqlite_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
@@ -373,10 +373,10 @@ Last-Update: 2014-06-03
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite *db = dbContainer->SQLiteInstance;
++ sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
-+ int result = sqlite_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
@@ -388,74 +388,74 @@ Last-Update: 2014-06-03
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite_reset(this->Statement);
++ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value);
-+ int status = sqlite_bind_int(this->Statement, index+1, value);
++ int status = sqlite3_bind_int(this->Statement, index+1, value);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
std::ostringstream errormessage;
- errormessage << "sqlite_bind_int returned error: " << status;
+ errormessage << "sqlite3_bind_int returned error: " << status;
@@ -673,11 +673,11 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite_reset(this->Statement);
++ sqlite3_reset(this->Statement);
}
-- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
-+ int status = sqlite_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
+- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite3_int64>(value));
++ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite3_int64>(value));
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
std::ostringstream errormessage;
- errormessage << "sqlite_bind_int64 returned error: " << status;
+ errormessage << "sqlite3_bind_int64 returned error: " << status;
@@ -702,12 +702,12 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite_reset(this->Statement);
++ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value);
-+ int status = sqlite_bind_double(this->Statement, index+1, value);
++ int status = sqlite3_bind_double(this->Statement, index+1, value);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
std::ostringstream errormessage;
- errormessage << "sqlite_bind_double returned error: " << status;
+ errormessage << "sqlite3_bind_double returned error: " << status;
@@ -731,12 +731,12 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite_reset(this->Statement);
++ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT);
-+ int status = sqlite_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
++ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
std::ostringstream errormessage;
- errormessage << "sqlite_bind_text returned error: " << status;
+ errormessage << "sqlite3_bind_text returned error: " << status;
@@ -760,17 +760,17 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite_reset(this->Statement);
++ sqlite3_reset(this->Statement);
}
int status =
- vtk_sqlite3_bind_blob(this->Statement,
-+ sqlite_bind_blob(this->Statement,
++ sqlite3_bind_blob(this->Statement,
index+1,
data,
length,
@@ -466,23 +466,23 @@ Last-Update: 2014-06-03
+ if (status != SQLITE_OK)
{
std::ostringstream errormessage;
- errormessage << "sqlite_bind_blob returned error: " << status;
+ errormessage << "sqlite3_bind_blob returned error: " << status;
@@ -794,12 +794,12 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite_reset(this->Statement);
++ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_clear_bindings(this->Statement);
-+ int status = sqlite_clear_bindings(this->Statement);
++ int status = sqlite3_clear_bindings(this->Statement);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
std::ostringstream errormessage;
- errormessage << "sqlite_clear_bindings returned error: " << status;
+ errormessage << "sqlite3_clear_bindings returned error: " << status;
--- a/IO/SQL/vtkSQLiteQuery.h
+++ b/IO/SQL/vtkSQLiteQuery.h
@@ -50,7 +50,7 @@
@@ -506,8 +506,8 @@ Last-Update: 2014-06-03
--- a/ThirdParty/sqlite/CMakeLists.txt
+++ b/ThirdParty/sqlite/CMakeLists.txt
@@ -1,4 +1,3 @@
- set(vtksqlite_THIRD_PARTY 1)
--set(vtksqlite_LIBRARIES vtksqlite)
-+set(vtksqlite_LIBRARIES sqlite3)
+ set(vtksqlite3_THIRD_PARTY 1)
+-set(vtksqlite3_LIBRARIES vtksqlite)
++set(vtksqlite3_LIBRARIES sqlite3)
vtk_module_export_info()
-add_subdirectory(vtksqlite)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk7.git
More information about the debian-science-commits
mailing list