Merge upstream version 4.5.2

1 files changed, 0 insertions, 43 deletions

diff --git a/src/libstrongswan/plugins/sqlite/sqlite_database.c b/src/libstrongswan/plugins/sqlite/sqlite_database.c
index e1c51f098..f9e06199e 100644
--- a/src/libstrongswan/plugins/sqlite/sqlite_database.c
+++ b/src/libstrongswan/plugins/sqlite/sqlite_database.c
@@ -213,15 +213,8 @@ static bool sqlite_enumerator_enumerate(sqlite_enumerator_t *this, ...)
 	return TRUE;
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of database_t.query.
- */
-static enumerator_t* query(private_sqlite_database_t *this, char *sql, ...)
-=======
 METHOD(database_t, query, enumerator_t*,
 	private_sqlite_database_t *this, char *sql, ...)
->>>>>>> upstream/4.5.1
 {
 	sqlite3_stmt *stmt;
 	va_list args;
@@ -253,15 +246,8 @@ METHOD(database_t, query, enumerator_t*,
 	return (enumerator_t*)enumerator;
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of database_t.execute.
- */
-static int execute(private_sqlite_database_t *this, int *rowid, char *sql, ...)
-=======
 METHOD(database_t, execute, int,
 	private_sqlite_database_t *this, int *rowid, char *sql, ...)
->>>>>>> upstream/4.5.1
 {
 	sqlite3_stmt *stmt;
 	int affected = -1;
@@ -293,15 +279,8 @@ METHOD(database_t, execute, int,
 	return affected;
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of database_t.get_driver
- */
-static db_driver_t get_driver(private_sqlite_database_t *this)
-=======
 METHOD(database_t, get_driver, db_driver_t,
 	private_sqlite_database_t *this)
->>>>>>> upstream/4.5.1
 {
 	return DB_SQLITE;
 }
@@ -317,15 +296,8 @@ static int busy_handler(private_sqlite_database_t *this, int count)
 	return 1;
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of database_t.destroy
- */
-static void destroy(private_sqlite_database_t *this)
-=======
 METHOD(database_t, destroy, void,
 	private_sqlite_database_t *this)
->>>>>>> upstream/4.5.1
 {
 	sqlite3_close(this->db);
 	this->mutex->destroy(this->mutex);
@@ -349,16 +321,6 @@ sqlite_database_t *sqlite_database_create(char *uri)
 	}
 	file = uri + 9;
 
-<<<<<<< HEAD
-	this = malloc_thing(private_sqlite_database_t);
-
-	this->public.db.query = (enumerator_t* (*)(database_t *this, char *sql, ...))query;
-	this->public.db.execute = (int (*)(database_t *this, int *rowid, char *sql, ...))execute;
-	this->public.db.get_driver = (db_driver_t(*)(database_t*))get_driver;
-	this->public.db.destroy = (void(*)(database_t*))destroy;
-
-	this->mutex = mutex_create(MUTEX_TYPE_RECURSIVE);
-=======
 	INIT(this,
 		.public = {
 			.db = {
@@ -370,17 +332,12 @@ sqlite_database_t *sqlite_database_create(char *uri)
 		},
 		.mutex = mutex_create(MUTEX_TYPE_RECURSIVE),
 	);
->>>>>>> upstream/4.5.1
 
 	if (sqlite3_open(file, &this->db) != SQLITE_OK)
 	{
 		DBG1(DBG_LIB, "opening SQLite database '%s' failed: %s",
 			 file, sqlite3_errmsg(this->db));
-<<<<<<< HEAD
-		destroy(this);
-=======
 		_destroy(this);
->>>>>>> upstream/4.5.1
 		return NULL;
 	}