Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 649a60b
Use sql_exec in pkg_repo.c
Baptiste Daroussin committed 14 years ago
commit 649a60b179460cd184cb6945ac9735b4506534fe
parent e249abc
3 files changed +9 -14
modified libpkg/pkg_private.h
@@ -180,4 +180,8 @@ int pkgdb_is_dir_used(struct pkgdb *db, const char *dir, int64_t *res);


int pkg_setrowid(struct pkg *, int64_t rowid);
+ 
/* pkgdb commands */
+ 
int sql_exec(sqlite3 *, const char *);
+ 
int64_t sql_is_rw(sqlite3 *);
+ 


#endif
modified libpkg/pkg_repo.c
@@ -281,19 +281,12 @@ pkg_create_repo(char *path, void (progress)(struct pkg *pkg, void *data), void *
		sqlite3_shutdown();

		return (EPKG_FATAL);

	}
-
- 
	if (sqlite3_exec(sqlite, initsql, NULL, NULL, &errmsg) != SQLITE_OK) {
- 
		pkg_emit_error("sqlite: %s", errmsg);
- 
		retcode = EPKG_FATAL;
+
+ 
	if ((retcode = sql_exec(sqlite, initsql)) != EPKG_OK)

		goto cleanup;
- 
	}
- 
	if (sqlite3_exec(sqlite, "BEGIN TRANSACTION;", NULL, NULL, &errmsg) !=
- 
		SQLITE_OK) {
- 
		pkg_emit_error("sqlite: %s", errmsg);
- 
		retcode = EPKG_FATAL;
+ 
	if ((retcode = sql_exec(sqlite, "BEGIN TRANSACTION;")) != EPKG_OK)

		goto cleanup;
- 
	}



	if (sqlite3_prepare_v2(sqlite, pkgsql, -1, &stmt_pkg, NULL) != SQLITE_OK) {

		ERROR_SQLITE(sqlite);
modified libpkg/pkgdb.c
@@ -28,11 +28,9 @@ static void pkgdb_regex_delete(void *);
static void pkgdb_pkglt(sqlite3_context *, int, sqlite3_value **);

static void pkgdb_pkggt(sqlite3_context *, int, sqlite3_value **);

static int get_pragma(sqlite3 *, const char *, int64_t *);
- 
static int sql_exec(sqlite3 *, const char *);

static int pkgdb_upgrade(sqlite3 *);

static void populate_pkg(sqlite3_stmt *stmt, struct pkg *pkg);

static int create_temporary_pkgjobs(sqlite3 *);
- 
static int64_t sql_is_rw(sqlite3 *);



static struct column_text_mapping {

	const char * const name;
@@ -1670,7 +1668,7 @@ pkgdb_unregister_pkg(struct pkgdb *db, const char *origin)
	return (EPKG_OK);

}
- 
static int
+ 
int

sql_exec(sqlite3 *s, const char *sql)

{

	char *errmsg;
@@ -1710,7 +1708,7 @@ get_pragma(sqlite3 *s, const char *sql, int64_t *res)
	return (EPKG_OK);

}
- 
static int64_t
+ 
int64_t

sql_is_rw(sqlite3 *s)

{

	int64_t rw=0;