4436918 - Part one of the language cleanup — HardenedBSD-pkg

modified pkg/add.c

@@ -105,7 +105,7 @@ exec_add(int argc, char **argv)

 			       PKGDB_MODE_CREATE,
 			       PKGDB_DB_LOCAL);
 	if (retcode == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to add packages");
 		warnx("Insufficient privileges to add packages");
 		return (EX_NOPERM);
 	} else if (retcode != EPKG_OK)
 		return (EX_IOERR);

@@ -134,7 +134,7 @@ exec_add(int argc, char **argv)

 			if (strcmp(file, "-") != 0 && access(file, F_OK) != 0) {
 				warn("%s", file);
 				if (errno == ENOENT)
 					warnx("Did you mean 'pkg install %s'?", file);
 					warnx("Was 'pkg install %s' meant?", file);
 				sbuf_cat(failedpkgs, argv[i]);
 				if (i != argc - 1)
 					sbuf_printf(failedpkgs, ", ");

modified pkg/annotate.c

@@ -82,7 +82,7 @@ do_add(struct pkgdb *db, struct pkg *pkg, const char *tag, const char *value)

 				pkg_get(pkg, PKG_NAME, &pkgname,
 					PKG_VERSION, &pkgversion);
 				warnx("%s-%s: Can't add annotation tagged: "
 				warnx("%s-%s: Cannot add annotation tagged: "
 				      "%s -- already exists", pkgname,
 				      pkgversion, tag);
 			}

@@ -140,7 +140,7 @@ do_delete(struct pkgdb *db, struct pkg *pkg, const char *tag)

 				pkg_get(pkg, PKG_NAME, &pkgname,
 					PKG_VERSION, &pkgversion);
 				warnx("%s-%s: Can't delete annotation "
 				warnx("%s-%s: Cannot delete annotation "
 				     "tagged: %s -- because there is none",
 				     pkgname, pkgversion, tag);
 			}

@@ -273,11 +273,11 @@ exec_annotate(int argc, char **argv)

 		exitcode = EX_OK;
 		goto cleanup;
 	} else if (retcode == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to modify package database");
 		warnx("Insufficient privileges to modify the package database");
 		exitcode = EX_NOPERM;
 		goto cleanup;
 	} else if (retcode != EPKG_OK) {
 		warnx("Error accessing package database");
 		warnx("Error accessing the package database");
 		exitcode = EX_SOFTWARE;
 		goto cleanup;
 	}

modified pkg/audit.c

@@ -942,10 +942,10 @@ exec_audit(int argc, char **argv)

 	if (ret == EPKG_ENODB)
 		return (EX_OK);
 	else if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to read package database");
 		warnx("Insufficient privileges to read the package database");
 		return (EX_NOPERM);
 	} else if (ret != EPKG_OK) {
 		warnx("Error accessing package database");
 		warnx("Error accessing the package database");
 		return (EX_IOERR);
 	}

@@ -954,7 +954,7 @@ exec_audit(int argc, char **argv)

 	if ((it = pkgdb_query(db, NULL, MATCH_ALL)) == NULL)
 	{
 		warnx("cannot query local database");
 		warnx("Error accessing the package database");
 		ret = EX_IOERR;
 		goto cleanup;
 	}

@@ -983,7 +983,7 @@ exec_audit(int argc, char **argv)

 		ret = EX_OK;
 	if (!quiet)
 		printf("%u problem(s) in your installed packages found.\n", vuln);
 		printf("%u problem(s) in the installed packages found.\n", vuln);
 cleanup:
 	pkgdb_it_free(it);

modified pkg/autoremove.c

@@ -88,13 +88,13 @@ exec_autoremove(__unused int argc, __unused char **argv)

 				       PKGDB_DB_LOCAL);
 	if (retcode == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to autoremove packages");
 		warnx("Insufficient privileges to autoremove packages");
 		return (EX_NOPERM);
 	} else if (retcode == EPKG_ENODB) {
 		warnx("No packages installed.  Nothing to do!");
 		return (EX_OK);
 	} else if (retcode != EPKG_OK) {
 		warnx("Error accessing package database");
 		warnx("Error accessing the package database");
 		return (EX_SOFTWARE);
 	}

modified pkg/check.c

@@ -181,7 +181,7 @@ fix_deps(struct pkgdb *db, struct deps_head *dh, int nbpkgs, bool yes)

 	if (yes) {
 		if (pkgdb_access(PKGDB_MODE_WRITE, PKGDB_DB_LOCAL) ==
 		    EPKG_ENOACCESS) {
 			warnx("Insufficient privilege to modify package "
 			warnx("Insufficient privileges to modify the package "
 			      "database");
 			free(pkgs);
 			pkg_jobs_free(jobs);

@@ -329,10 +329,10 @@ exec_check(int argc, char **argv)

 		warnx("No packages installed.  Nothing to do!");
 		return (EX_OK);
 	} else if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to access package database");
 		warnx("Insufficient privileges to access the package database");
 		return (EX_NOPERM);
 	} else if (ret != EPKG_OK) {
 		warnx("Error accessing package database");
 		warnx("Error accessing the package database");
 		return (EX_SOFTWARE);
 	}

@@ -383,7 +383,7 @@ exec_check(int argc, char **argv)

 		if (dcheck && nbpkgs > 0 && !noinstall) {
 			printf("\n>>> Missing package dependencies were detected.\n");
 			printf(">>> Found %d issue(s) in total with your package database.\n\n", nbpkgs);
 			printf(">>> Found %d issue(s) in the package database.\n\n", nbpkgs);
 			ret = fix_deps(db, &dh, nbpkgs, yes);
 			if (ret == EPKG_OK)

modified pkg/clean.c

@@ -158,7 +158,7 @@ display_dellist(struct dl_head *dl, const char *cachedir)

 			       "(unknown)");
 			break;
 		case REMOVED:
 			printf("Removed from repository\n");
 			printf("Removed from the repository\n");
 			break;
 		case CKSUM_MISMATCH:
 			printf("Checksum mismatch\n");

@@ -268,13 +268,13 @@ exec_clean(int argc, char **argv)

 	retcode = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_REPO);
 	if (retcode == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to clean old packages");
 		warnx("Insufficient privileges to clean old packages");
 		return (EX_NOPERM);
 	} else if (retcode == EPKG_ENODB) {
 		warnx("No package database installed.  Nothing to do!");
 		return (EX_OK);
 	} else if (retcode != EPKG_OK) {
 		warnx("Error accessing package database");
 		warnx("Error accessing the package database");
 		return (EX_SOFTWARE);
 	}

@@ -391,7 +391,7 @@ exec_clean(int argc, char **argv)

 	if (!dry_run) {
 		if (!yes)
 			yes = query_yesno(
 				"\nProceed with cleaning cache [y/N]: ");
 				"\nProceed with cleaning the cache [y/N]: ");
 		if (yes)
 			retcode = delete_dellist(&dl);
 	} else

modified pkg/create.c

@@ -104,7 +104,7 @@ pkg_create_matches(int argc, char **argv, match_t match, pkg_formats fmt,

 	for (i = 0; i < argc || match == MATCH_ALL; i++) {
 		if (match == MATCH_ALL) {
 			printf("Loading package list...\n");
 			printf("Loading the package list...\n");
 			if ((it = pkgdb_query(db, NULL, match)) == NULL)
 				goto cleanup;
 			match = !MATCH_ALL;

modified pkg/delete.c

@@ -121,10 +121,10 @@ exec_delete(int argc, char **argv)

 		warnx("No packages installed.  Nothing to do!");
 		return (EX_OK);
 	} else if (retcode == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to delete packages");
 		warnx("Insufficient privileges to delete packages");
 		return (EX_NOPERM);
 	} else if (retcode != EPKG_OK) {
 		warnx("Error accessing package database");
 		warnx("Error accessing the package database");
 		return (EX_SOFTWARE);
 	}

@@ -156,8 +156,8 @@ exec_delete(int argc, char **argv)

 	if (((pkg_jobs_find(jobs, "ports-mgmt/pkg", NULL) == EPKG_OK) ||
 	    (pkg_jobs_find(jobs, "ports-mgmt/pkg-devel", NULL) == EPKG_OK))
 	     && !force) {
 		warnx("You are about to delete 'ports-mgmt/pkg' which is really "
 		    "dangerous. You can't do that without specifying -f");
 		warnx("Deleting 'ports-mgmt/pkg' is really dangerous. "
 		"If that is really required, -f must be specified");
 		goto cleanup;
 	}

modified pkg/query.c

@@ -768,7 +768,7 @@ analyse_query_string(char *qstr, struct query_flags *q_flags, const unsigned int

 					/* if this is a multiline flag */
 					if (q_flags[i].multiline == 1) {
 						if (*multiline != 0 && *multiline != q_flags[i].flag) {
 							fprintf(stderr, "Invalid query: you cannot query '%%%c' and '%%%c' at the same time\n",
 							fprintf(stderr, "Invalid query: '%%%c' and '%%%c' cannot be queried at the same time\n",
 									*multiline, q_flags[i].flag);
 							return (EPKG_FATAL);
 						} else {

modified pkg/search.c

@@ -91,8 +91,8 @@ match_optarg(const cliopt *optlist, const char *opt)

 		if (strncmp(opt, optlist[i].option, optlen) != 0)
 			continue;
 		if (matched > 0) {
 			warnx("\"%s\" is ambiguous: did you mean "
 			      "\"%s\" or \"%s\"?", opt,
 			warnx("\"%s\" is ambiguous. Was "
 			      "\"%s\" or \"%s\" meant?", opt,
 			      optlist[matched].option, optlist[i].option);
 			key = '\0';
 			break;