a108958 Fix dead assignment — HardenedBSD-pkg

modified libpkg/backup.c

@@ -83,8 +83,6 @@ copy_database(sqlite3 *src, sqlite3 *dst)

 	b = sqlite3_backup_init(dst, "main", src, "main");
 	total = 0;
 	pkg_emit_progress_start(NULL);
 	do {
 		ret = sqlite3_backup_step(b, NPAGES);

modified libpkg/diff.c

@@ -248,7 +248,6 @@ static void longestCommonSequence(

   span = (iE1 - iS1) + (iE2 - iS2);
   bestScore = -10000;
   score = 0;
   iSXb = iSXp = iS1;
   iEXb = iEXp = iS1;
   iSYb = iSYp = iS2;

modified libpkg/pkg_add.c

@@ -610,7 +610,6 @@ do_extract(struct archive *a, struct archive_entry *ae,

 	pkg_emit_progress_start(NULL);
 	do {
 		ret = ARCHIVE_OK;
 		pkg_absolutepath(archive_entry_pathname(ae), path, sizeof(path), true);
 		switch (archive_entry_filetype(ae)) {
 		case AE_IFDIR:

modified libpkg/pkg_delete.c

@@ -106,7 +106,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)

 		return (ret);
 	if ((flags & (PKG_DELETE_NOSCRIPT | PKG_DELETE_UPGRADE)) == 0)
 		ret = pkg_script_run(pkg, PKG_SCRIPT_POST_DEINSTALL);
 		pkg_script_run(pkg, PKG_SCRIPT_POST_DEINSTALL);
 	ret = pkg_delete_dirs(db, pkg, NULL);
 	if (ret != EPKG_OK)

modified libpkg/pkg_jobs.c

@@ -863,9 +863,7 @@ pkg_jobs_guess_upgrade_candidate(struct pkg_jobs *j, const char *pattern)

 			return (EPKG_OK);
 		pos ++;
 		pattern = pos;
 	}
 	else {
 	} else {
 		pos = pattern;
 	}

@@ -1658,10 +1656,6 @@ jobs_solve_fetch(struct pkg_jobs *j)

 	struct pkg *pkg = NULL;
 	struct pkgdb_it *it;
 	struct pkg_job_request *req, *rtmp;
 	unsigned flag = PKG_LOAD_BASIC|PKG_LOAD_ANNOTATIONS;
 	if ((j->flags & PKG_FLAG_WITH_DEPS) == PKG_FLAG_WITH_DEPS)
 		flag |= PKG_LOAD_DEPS;
 	if ((j->flags & PKG_FLAG_UPGRADES_FOR_INSTALLED) == PKG_FLAG_UPGRADES_FOR_INSTALLED) {
 		if ((it = pkgdb_query(j->db, NULL, MATCH_ALL)) == NULL)

modified libpkg/pkg_jobs_universe.c

@@ -246,7 +246,6 @@ pkg_jobs_universe_process_deps(struct pkg_jobs_universe *universe,

 	bool found = false;
 	rpkg = NULL;
 	rc = EPKG_OK;
 	if (flags & DEPS_FLAG_REVERSE) {
 		deps_func = pkg_rdeps;

modified libpkg/pkg_repo_create.c

@@ -479,7 +479,6 @@ pkg_create_repo_read_pipe(int fd, struct digest_list_entry **dlist)

 				assert(dig->digest != NULL);
 				DL_APPEND(*dlist, dig);
 				state = s_set_origin;
 				start = i + 1;
 				break;
 			}
 			else if (buf[i] == '.' && buf[i + 1] == '\n') {

modified src/autoremove.c

@@ -81,7 +81,6 @@ exec_autoremove(int argc, char **argv)

 		}
 	}
 	argc -= optind;
 	argv += optind;
 	if (argc != 0) {
 		usage_autoremove();

modified src/backup.c

@@ -75,8 +75,6 @@ exec_backup(int argc, char **argv)

 			return (EX_USAGE);
 		}
 	}
 	argc -= optind;
 	argv += optind;
 	if ( dump == restore ) {
 		usage_backup();

modified src/clean.c

@@ -335,8 +335,6 @@ exec_clean(int argc, char **argv)

 			return (EX_USAGE);
 		}
 	}
 	argc -= optind;
 	argv += optind;
 	cachedir = pkg_object_string(pkg_config_get("PKG_CACHEDIR"));
 	cachefd = open(cachedir, O_DIRECTORY|O_CLOEXEC);

modified src/event.c

@@ -620,7 +620,6 @@ event_callback(void *data, struct pkg_event *ev)

 	case PKG_EVENT_INSTALL_FINISHED:
 		if (quiet)
 			break;
 		pkg = ev->e_install_finished.pkg;
 		break;
 	case PKG_EVENT_EXTRACT_BEGIN:
 		if (quiet)

@@ -723,7 +722,6 @@ event_callback(void *data, struct pkg_event *ev)

 	case PKG_EVENT_UPGRADE_FINISHED:
 		if (quiet)
 			break;
 		pkg_new = ev->e_upgrade_finished.n;
 		break;
 	case PKG_EVENT_LOCKED:
 		pkg = ev->e_locked.pkg;

modified src/plugins.c

@@ -59,13 +59,11 @@ exec_plugins(int argc, char **argv)

 		case 'l':
 			list_only = true;
 			break;
                 default:
                         usage_plugins();
                         return (EX_USAGE);
                 }
         }
         argc -= optind;
         argv += optind;
 		default:
 			usage_plugins();
 			return (EX_USAGE);
 		}
 	}
 	/**
 	 * For now only display the available plugins

modified src/register.c

@@ -132,8 +132,7 @@ exec_register(int argc, char **argv)

 	} else if (retcode != EPKG_OK) {
 		pkg_free(pkg);
 		return (EX_IOERR);
 	} else
 		retcode = EX_OK;
 	}
 	/*
 	 * Ideally, the +MANIFEST should be all that is necessary,

modified src/stats.c

@@ -87,10 +87,9 @@ exec_stats(int argc, char **argv)

 		default:
 			usage_stats();
 			return (EX_USAGE);
                 }
         }
         argc -= optind;
         argv += optind;
 		}
 	}
 	argv += optind;
 	/* default is to show everything we have */
 	if (opt == 0)

modified src/update.c

@@ -160,7 +160,6 @@ exec_update(int argc, char **argv)

 		}
 	}
 	argc -= optind;
 	argv += optind;
 	if (argc != 0) {
 		usage_update();

modified src/utils.c

@@ -729,8 +729,6 @@ set_jobs_summary_pkg(struct pkg_jobs *jobs, struct pkg *new_pkg,

 	switch (type) {
 	case PKG_SOLVED_INSTALL:
 	case PKG_SOLVED_UPGRADE:
 		ret = EPKG_FATAL;
 		if (destdir == NULL)
 			ret = pkg_repo_cached_name(new_pkg, path, sizeof(path));
 		else if (repopath != NULL) {