diff options
Diffstat (limited to 'src/libstrongswan/plugins/sqlite')
| -rw-r--r-- | src/libstrongswan/plugins/sqlite/Makefile.in | 12 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/sqlite/sqlite_database.c | 43 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/sqlite/sqlite_plugin.c | 21 |
3 files changed, 11 insertions, 65 deletions
diff --git a/src/libstrongswan/plugins/sqlite/Makefile.in b/src/libstrongswan/plugins/sqlite/Makefile.in index bf952acc5..e2ec799a9 100644 --- a/src/libstrongswan/plugins/sqlite/Makefile.in +++ b/src/libstrongswan/plugins/sqlite/Makefile.in @@ -222,13 +222,7 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ ipsecdir = @ipsecdir@ -<<<<<<< HEAD -ipsecgid = @ipsecgid@ ipsecgroup = @ipsecgroup@ -ipsecuid = @ipsecuid@ -======= -ipsecgroup = @ipsecgroup@ ->>>>>>> upstream/4.5.1 ipsecuser = @ipsecuser@ libcharon_plugins = @libcharon_plugins@ libdir = @libdir@ @@ -249,6 +243,8 @@ nm_ca_dir = @nm_ca_dir@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ p_plugins = @p_plugins@ +pcsclite_CFLAGS = @pcsclite_CFLAGS@ +pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ piddir = @piddir@ pki_plugins = @pki_plugins@ @@ -267,14 +263,12 @@ sbindir = @sbindir@ scepclient_plugins = @scepclient_plugins@ scripts_plugins = @scripts_plugins@ sharedstatedir = @sharedstatedir@ -<<<<<<< HEAD -======= soup_CFLAGS = @soup_CFLAGS@ soup_LIBS = @soup_LIBS@ ->>>>>>> upstream/4.5.1 srcdir = @srcdir@ strongswan_conf = @strongswan_conf@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ 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; } diff --git a/src/libstrongswan/plugins/sqlite/sqlite_plugin.c b/src/libstrongswan/plugins/sqlite/sqlite_plugin.c index e0bdf0634..d8c6a560c 100644 --- a/src/libstrongswan/plugins/sqlite/sqlite_plugin.c +++ b/src/libstrongswan/plugins/sqlite/sqlite_plugin.c @@ -31,15 +31,14 @@ struct private_sqlite_plugin_t { sqlite_plugin_t public; }; -<<<<<<< HEAD -/** - * Implementation of plugin_t.destroy - */ -static void destroy(private_sqlite_plugin_t *this) -======= +METHOD(plugin_t, get_name, char*, + private_sqlite_plugin_t *this) +{ + return "sqlite"; +} + METHOD(plugin_t, destroy, void, private_sqlite_plugin_t *this) ->>>>>>> upstream/4.5.1 { lib->db->remove_database(lib->db, (database_constructor_t)sqlite_database_create); @@ -51,21 +50,17 @@ METHOD(plugin_t, destroy, void, */ plugin_t *sqlite_plugin_create() { -<<<<<<< HEAD - private_sqlite_plugin_t *this = malloc_thing(private_sqlite_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; -======= private_sqlite_plugin_t *this; INIT(this, .public = { .plugin = { + .get_name = _get_name, + .reload = (void*)return_false, .destroy = _destroy, }, }, ); ->>>>>>> upstream/4.5.1 lib->db->add_database(lib->db, (database_constructor_t)sqlite_database_create); |