320ee51 Simple sqlite usage cleanup — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Simple sqlite usage cleanup

Baptiste Daroussin committed 14 years ago

commit 320ee51597500245cb938ee288903c1a201f2cef
parent 1aee2f5

3 files changed +16 -14

modified external/sqlite/Makefile

@@ -19,7 +19,20 @@ CFLAGS+= -DSQLITE_OMIT_AUTHORIZATION \

 		-DSQLITE_OMIT_PROGRESS_CALLBACK \
 		-DSQLITE_OMIT_TCL_VARIABLE \
 		-DSQLITE_OMIT_UTF16 \
 		-DSQLITE_OMIT_CAT \
 		-DSQLITE_OMIT_CHECK \
 		-DSQLITE_OMIT_COMPOUND_SELECT \
 		-DSQLITE_OMIT_AUTOINIT \
 		-DSQLITE_OMIT_COMPILEOPTION_DIAGS \
 		-DSQLITE_OMIT_INCRBLOB \
 		-DSQLITE_OMIT_INTEGRITY_CHECK \
 		-DSQLITE_OMIT_BLOB_LITERAL \
 		-DSQLITE_OMIT_BUILTIN_TEST \
 		-DSQLITE_OMIT_MEMORYDB \
 		-DSQLITE_OMIT_SHARED_CACHE \
 		-DSQLITE_OMIT_TEMPDB \
 		-DUSE_PREAD \
 		-DSQLITE_THREADSAFE=1 \
 		-DNDEBUG
 NO_MAN=		true

modified libpkg/packing.c

@@ -90,8 +90,7 @@ packing_append_file(struct packing *pack, const char *filepath, const char *newp

 		retcode = EPKG_FATAL;
 		goto cleanup;
 	}
 	retcode = archive_read_disk_entry_from_file(pack->aread, pack->entry, -1,
 												&st);
 	retcode = archive_read_disk_entry_from_file(pack->aread, pack->entry, -1, &st);
 	if (retcode != ARCHIVE_OK) {
 		EMIT_PKG_ERROR("%s: %s", filepath, archive_error_string(pack->aread));
 		retcode = EPKG_FATAL;

modified libpkg/pkgdb.c

@@ -282,6 +282,7 @@ pkgdb_open(struct pkgdb **db, pkgdb_t type, const char *dbfile)

 		}
 	}
 	sqlite3_initialize();
 	if (sqlite3_open(localpath, &(*db)->sqlite) != SQLITE_OK) {
 		ERROR_SQLITE((*db)->sqlite);
 		free(*db);

@@ -353,7 +354,7 @@ pkgdb_close(struct pkgdb *db)

 		sqlite3_close(db->sqlite);
 	}
 	sqlite3_shutdown();
 	free(db);
 }

@@ -1126,8 +1127,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)

 			ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		sqlite3_reset(stmt_dep);
 	}
 	/*

@@ -1147,8 +1146,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)

 			ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		sqlite3_reset(stmt_conflict);
 	}
 	/*

@@ -1175,7 +1172,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)

 			}
 			goto cleanup;
 		}
 		sqlite3_reset(stmt_file);
 	}
 	/*

@@ -1199,7 +1195,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)

 				ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		sqlite3_reset(stmt_dirs);
 	}
 	/*

@@ -1223,7 +1218,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)

 				ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		sqlite3_reset(stmt_cat);
 	}
 	/*

@@ -1244,8 +1238,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)

 			ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		sqlite3_reset(stmt_script);
 	}
 	/*

@@ -1266,8 +1258,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)

 			ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		sqlite3_reset(stmt_option);
 	}
 	retcode = EPKG_OK;