c314841 - Part two of the language cleanup — HardenedBSD-pkg

modified pkg/fetch.c

@@ -130,7 +130,7 @@ exec_fetch(int argc, char **argv)

 	retcode = pkgdb_access(mode, PKGDB_DB_REPO);
 	if (retcode == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to access repo catalogue");
 		warnx("Insufficient privileges to access repo catalogue");
 		return (EX_NOPERM);
 	} else if (retcode != EPKG_OK)
 		return (EX_IOERR);

@@ -139,7 +139,7 @@ exec_fetch(int argc, char **argv)

 		retcode = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_LOCAL);
 		if (retcode == EPKG_ENOACCESS) {
 			warnx("Insufficient privilege to access package DB");
 			warnx("Insufficient privileges to access the package database");
 			return (EX_NOPERM);
 		} else if (retcode != EPKG_OK)
 			return (EX_IOERR);

modified pkg/info.c

@@ -212,7 +212,7 @@ exec_info(int argc, char **argv)

 	ret = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_LOCAL);
 	if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to query package database");
 		warnx("Insufficient privileges to query the package database");
 		return (EX_NOPERM);
 	} else if (ret == EPKG_ENODB) {
 		if (match == MATCH_ALL)

modified pkg/install.c

@@ -144,7 +144,7 @@ exec_install(int argc, char **argv)

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

modified pkg/lock.c

@@ -168,10 +168,10 @@ exec_lock_unlock(int argc, char **argv, enum action action)

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

modified pkg/main.c

@@ -145,7 +145,7 @@ usage(const char *conffile, const char *reposdir)

 	fprintf(stderr, "\t%-15s%s\n", "-c", "Execute pkg(1) inside a chroot(8)");
 	fprintf(stderr, "\t%-15s%s\n", "-C", "Use the specified configuration file");
 	fprintf(stderr, "\t%-15s%s\n", "-R", "Directory to search for individual repository configurations");
 	fprintf(stderr, "\t%-15s%s\n", "-l", "List available command and exit");
 	fprintf(stderr, "\t%-15s%s\n", "-l", "List available commands and exit");
 	fprintf(stderr, "\t%-15s%s\n", "-v", "Display pkg(1) version");
 	fprintf(stderr, "\t%-15s%s\n\n", "-N", "Test if pkg(1) is activated and avoid auto-activation");
 	fprintf(stderr, "Commands supported:\n");

@@ -350,7 +350,7 @@ show_plugin_info(void)

 	while (pkg_plugins(&p) == EPKG_OK) {
 		conf = NULL;
 		printf("Configurations for plugin: %s\n",
 		printf("Configuration for plugin: %s\n",
 		    pkg_plugin_get(p, PKG_PLUGIN_NAME));
 		while (pkg_plugin_confs(p, &conf) == EPKG_OK) {

modified pkg/query.c

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

 	j = 0; /* shut up scanbuild */
 	if (strchr(qstr, '%') == NULL) {
 		fprintf(stderr, "Invalid query: query should contains format string\n");
 		fprintf(stderr, "Invalid query: query should contain a format string\n");
 		return (EPKG_FATAL);
 	}

@@ -902,7 +902,7 @@ exec_query(int argc, char **argv)

 	ret = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_LOCAL);
 	if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to query package database");
 		warnx("Insufficient privileges to query the package database");
 		return (EX_NOPERM);
 	} else if (ret == EPKG_ENODB) {
 		if (!quiet)

modified pkg/register.c

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

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

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

 	if (mfile == NULL && mdir == NULL) {
 		warnx("one of either -m or -M flags is required");
 		warnx("One of either -m or -M flags is required");
 		usage_register();
 		return (EX_USAGE);
 	}

modified pkg/repo.c

@@ -122,7 +122,7 @@ exec_repo(int argc, char **argv)

 		ret = pkg_create_repo(argv[0], force, filelist, NULL, NULL);
 	if (ret != EPKG_OK) {
 		printf("cannot create repository catalogue\n");
 		printf("Cannot create repository catalogue\n");
 		return (EX_IOERR);
 	} else {
 		if (!quiet)

modified pkg/rquery.c

@@ -159,7 +159,7 @@ exec_rquery(int argc, char **argv)

 	ret = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_REPO);
 	if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to query package database");
 		warnx("Insufficient privileges to query the package database");
 		return (EX_NOPERM);
 	} else if (ret != EPKG_OK)
 		return (EX_IOERR);

modified pkg/search.c

@@ -363,7 +363,7 @@ exec_search(int argc, char **argv)

 	ret = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_REPO);
 	if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to query package database");
 		warnx("Insufficient privileges to query the package database");
 		return (EX_NOPERM);
 	} else if (ret != EPKG_OK)
 		return (EX_IOERR);

modified pkg/set.c

@@ -138,7 +138,7 @@ exec_set(int argc, char **argv)

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

modified pkg/update.c

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

 	ret = pkgdb_access(PKGDB_MODE_WRITE|PKGDB_MODE_CREATE,
 			   PKGDB_DB_REPO);
 	if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to update repository "
 		warnx("Insufficient privileges to update the repository "
 		      "catalogue");
 		return (EX_NOPERM);
 	} else if (ret != EPKG_OK)