Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5c1c256
Remove warnings.
Vsevolod Stakhov committed 12 years ago
commit 5c1c2567db6586419010dd6b49883bf10617e130
parent 3c474f3
6 files changed +5 -13
modified configure.ac
@@ -12,6 +12,7 @@ AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-dist-gzip dist-xz])
AC_PROG_CC_C99

LT_INIT()

AC_CONFIG_MACRO_DIR([m4])
+ 
AX_CFLAGS_WARN_ALL



AC_C_CONST

AC_TYPE_SIZE_T
modified libpkg/pkg_jobs.c
@@ -240,7 +240,6 @@ pkg_jobs_add_req(struct pkg_jobs *j, const char *origin, struct pkg_job_universe
		bool add)

{

	struct pkg_job_request *req, *test, **head;
- 
	bool replace = false;



	if (add)

		head = &j->request_add;
@@ -517,7 +516,6 @@ pkg_jobs_handle_pkg_universe(struct pkg_jobs *j, struct pkg *pkg,
{

	struct pkg_job_universe_item *item, *cur, *tmp = NULL;

	const char *origin, *digest, *version, *name;
- 
	int rc;

	struct pkg_job_seen *seen;



	pkg_get(pkg, PKG_ORIGIN, &origin, PKG_DIGEST, &digest,
@@ -580,7 +578,6 @@ pkg_jobs_add_universe(struct pkg_jobs *j, struct pkg *pkg,
	struct pkg *npkg, *rpkg;

	int ret;

	struct pkg_job_universe_item *unit;
- 
	const char *origin;



	if (!deps_only) {

		/* Add the requested package itself */
@@ -1490,13 +1487,8 @@ static int
jobs_solve_install(struct pkg_jobs *j)

{

	struct job_pattern *jp, *jtmp;
- 
	struct pkg *pkg;
- 
	struct pkgdb_it *it;

	struct pkg_job_request *req, *rtmp;
- 
	const char *origin;

	bool got_local;
- 
	int flags = PKG_LOAD_BASIC|PKG_LOAD_OPTIONS|PKG_LOAD_DEPS|
- 
			PKG_LOAD_SHLIBS_REQUIRED|PKG_LOAD_ANNOTATIONS|PKG_LOAD_CONFLICTS;



	if ((j->flags & PKG_FLAG_PKG_VERSION_TEST) == PKG_FLAG_PKG_VERSION_TEST) {

		if (new_pkg_version(j)) {
@@ -1706,7 +1698,6 @@ pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j, bool handle_r
	bool automatic = false;

	int flags = 0;

	int retcode = EPKG_FATAL;
- 
	struct job_pattern *jp;



	old = ps->items[1] ? ps->items[1]->pkg : NULL;

	new = ps->items[0]->pkg;
modified libpkg/pkg_manifest.c
@@ -845,7 +845,6 @@ emit_manifest(struct pkg *pkg, struct sbuf **out, short flags)
	struct pkg_user		*user     = NULL;

	struct pkg_group	*group    = NULL;

	struct pkg_shlib	*shlib    = NULL;
- 
	struct pkg_note		*note     = NULL;

	struct pkg_conflict	*conflict = NULL;

	struct pkg_provide	*provide  = NULL;

	struct sbuf		*tmpsbuf  = NULL;
modified libpkg/pkg_solve.c
@@ -519,7 +519,7 @@ pkg_solve_add_pkg_rule(struct pkg_jobs *j, struct pkg_solve_problem *problem,
		struct pkg_solve_variable *pvar, bool conflicting)

{

	struct pkg_dep *dep, *dtmp;
- 
	struct pkg_conflict *conflict, *ctmp, *cfound;
+ 
	struct pkg_conflict *conflict, *ctmp;

	struct pkg *pkg;

	struct pkg_solve_rule *rule;

	struct pkg_solve_item *it = NULL;
@@ -869,7 +869,7 @@ static void
pkg_solve_insert_res_job (struct pkg_solve_variable *var,

		struct pkg_solve_problem *problem, struct pkg_jobs *j)

{
- 
	struct pkg_solved *res, *dres;
+ 
	struct pkg_solved *res;

	struct pkg_solve_variable *cur_var, *del_var = NULL, *add_var = NULL;

	int seen_add = 0, seen_del = 0;
modified libpkg/update.c
@@ -617,7 +617,7 @@ pkg_parse_conflicts_file(FILE *f, sqlite3 *sqlite)
static int

pkg_update_incremental(const char *name, struct pkg_repo *repo, time_t *mtime)

{
- 
	FILE *fmanifest = NULL, *fdigests = NULL, *fconflicts = NULL;
+ 
	FILE *fmanifest = NULL, *fdigests = NULL /*, *fconflicts = NULL*/;

	sqlite3 *sqlite = NULL;

	struct pkg *pkg = NULL;

	int rc = EPKG_FATAL;
modified m4/.gitignore
@@ -2,3 +2,4 @@
*

# Except this file

!.gitignore
+ 
!ax_*.m4