Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
pkg: avoid a bunch of warnings
Pierre Pronchery committed 2 months ago
commit cf901ce029bcce1e6415a19406f31bbb7619e9d6
parent fb6eeff
13 files changed +85 -67
modified libpkg/flags.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdio/flags.c 326025 2017-11-20 19:49:47Z pfg
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
+
#include "private/utils.h"

/*
 * Return the (stdio) flags for a given mode.  Store the flags
modified libpkg/pkg.c
@@ -906,6 +906,16 @@ pkg_shlib_flags_from_abi(const struct pkg_abi *shlib_abi)
				flags |= PKG_SHLIB_FLAGS_COMPAT_32;
			}
			break;
+
		case PKG_ARCH_UNKNOWN:
+
		case PKG_ARCH_I386:
+
		case PKG_ARCH_ARMV6:
+
		case PKG_ARCH_ARMV7:
+
		case PKG_ARCH_POWERPC:
+
		case PKG_ARCH_POWERPC64LE:
+
		case PKG_ARCH_RISCV32:
+
		case PKG_ARCH_RISCV64:
+
		case PKG_ARCH_ANY:
+
			break;
		}
	}

@@ -1195,6 +1205,13 @@ pkg_list_free(struct pkg *pkg, pkg_list list) {
		pkg->conflictshash = NULL;
		pkg->flags &= ~PKG_LOAD_CONFLICTS;
		break;
+
	case PKG_USERS:
+
	case PKG_GROUPS:
+
	case PKG_SHLIBS_REQUIRED:
+
	case PKG_SHLIBS_PROVIDED:
+
	case PKG_PROVIDES:
+
	case PKG_REQUIRES:
+
		break;
	}
}

modified libpkg/pkg_abi.c
@@ -95,7 +95,7 @@ pkg_os_to_string(enum pkg_os os)
	assert(0);
}

-
enum pkg_os
+
static enum pkg_os
pkg_os_from_string(const char *string)
{
	for (size_t i = 0; os_string_table[i].string != NULL; i++) {
@@ -146,7 +146,7 @@ pkg_arch_to_string(enum pkg_os os, enum pkg_arch arch)
	assert(0);
}

-
enum pkg_arch
+
static enum pkg_arch
pkg_arch_from_string(enum pkg_os os, const char *string)
{
	if (os == PKG_OS_DRAGONFLY) {
@@ -526,7 +526,7 @@ pkg_analyse_files(struct pkgdb *db __unused, struct pkg *pkg, const char *stage)
	int (*pkg_analyse_init)(const char *stage);
	int (*pkg_analyse)(const bool developer_mode, struct pkg *pkg,
	    const char *fpath, char **provided, enum pkg_shlib_flags *flags);
-
	int (*pkg_analyse_close)();
+
	int (*pkg_analyse_close)(void);

	if (0 == strncmp(pkg->abi, "Darwin", 6)) {
		pkg_analyse_init=pkg_analyse_init_macho;
modified libpkg/pkg_add.c
@@ -56,7 +56,7 @@ merge_with_external_tool(const char *merge_tool, struct pkg_config_file *lcf,
	int status;
	FILE *inout[2];

-
	char *tmpdir = getenv("TMPDIR");
+
	char const *tmpdir = getenv("TMPDIR");
	if (tmpdir == NULL)
		tmpdir = "/tmp";

modified libpkg/pkg_checksum.c
@@ -535,7 +535,8 @@ static void
pkg_checksum_encode_base32(unsigned char *in, size_t inlen,
				char *out, size_t outlen)
{
-
	int i, remain = -1, r, x;
+
	size_t i;
+
	int remain = -1, r, x;

	if (outlen < inlen * 8 / 5) {
		pkg_emit_error("cannot encode base32 as outlen is not sufficient");
@@ -593,7 +594,7 @@ static void
pkg_checksum_encode_hex(unsigned char *in, size_t inlen,
				char *out, size_t outlen)
{
-
	int i;
+
	size_t i;

	if (outlen < inlen * 2) {
		pkg_emit_error("cannot encode hex as outlen is not sufficient");
modified libpkg/pkg_key.c
@@ -38,7 +38,7 @@ pkg_key_new(struct pkg_key **key, const char *keytype, const char *keypath,
    pkg_password_cb *cb)
{
	struct pkg_key *nkey;
-
	struct pkgsign_ctx *ctx = NULL;
+
	struct pkgsign_ctx *nctx = NULL;
	int ret;

	assert(*key == NULL);
@@ -46,14 +46,14 @@ pkg_key_new(struct pkg_key **key, const char *keytype, const char *keypath,
	if (*keypath == '\0')
		return (EPKG_FATAL);

-
	ret = pkgsign_new_sign(keytype, &ctx);
+
	ret = pkgsign_new_sign(keytype, &nctx);
	if (ret != 0)
		return (EPKG_FATAL);

-
	pkgsign_set(ctx, cb, keypath);
+
	pkgsign_set(nctx, cb, keypath);

	nkey = xcalloc(1, sizeof(*nkey));
-
	nkey->ctx = ctx;
+
	nkey->ctx = nctx;

	*key = nkey;
	return (EPKG_OK);
modified libpkg/pkg_manifest.c
@@ -966,7 +966,6 @@ pkg_emit_object(struct pkg *pkg, short flags)
	struct pkg_conflict	*conflict = NULL;
	struct pkg_config_file	*cf       = NULL;
	xstring		*tmpsbuf  = NULL;
-
	int i;
	const char *script_types = NULL;
	char legacyarch[BUFSIZ];
	char perm_str[sizeof("00000")];
@@ -1285,7 +1284,7 @@ pkg_emit_object(struct pkg *pkg, short flags)

		dbg(4, "Emitting scripts");
		map = NULL;
-
		for (i = 0; i < PKG_NUM_SCRIPTS; i++) {
+
		for (int i = 0; i < PKG_NUM_SCRIPTS; i++) {
			if (pkg_script_get(pkg, i) == NULL)
				continue;

@@ -1322,7 +1321,7 @@ pkg_emit_object(struct pkg *pkg, short flags)

		dbg(4, "Emitting lua scripts");
		map = NULL;
-
		for (i = 0; i < PKG_NUM_LUA_SCRIPTS; i++) {
+
		for (int i = 0; i < PKG_NUM_LUA_SCRIPTS; i++) {
			if (vec_len(&pkg->lua_scripts[i]) == 0)
				continue;
			switch(i) {
modified libpkg/pkg_osvf.c
@@ -528,7 +528,7 @@ struct pkg_osvf_hash
	char *name;
};

-
struct pkg_osvf_hash references_global[] =
+
static struct pkg_osvf_hash references_global[] =
{
	{OSVF_REFERENCE_ADVISORY, "ADVISORY"},
	{OSVF_REFERENCE_ARTICLE, "ARTICLE"},
@@ -543,7 +543,7 @@ struct pkg_osvf_hash references_global[] =
	{OSVF_REFERENCE_UNKNOWN, NULL}
};

-
struct pkg_osvf_hash event_global[] =
+
static struct pkg_osvf_hash event_global[] =
{
	{OSVF_EVENT_VERSION_SEMVER, "SEMVER"},
	{OSVF_EVENT_VERSION_ECOSYSTEM, "ECOSYSTEM"},
@@ -552,7 +552,7 @@ struct pkg_osvf_hash event_global[] =
};

static ucl_object_t *
-
create_schema_obj()
+
create_schema_obj(void)
{
	struct ucl_parser *uclparser;
	ucl_object_t *obj = NULL;
@@ -630,8 +630,8 @@ pkg_osvf_open(const char *location)
	return (obj);
}

-
struct pkg_audit_entry *
-
pkg_osvf_new_entry()
+
static struct pkg_audit_entry *
+
pkg_osvf_new_entry(void)
{
	struct pkg_audit_entry *entry = xcalloc(1, sizeof(struct pkg_audit_entry));

@@ -644,7 +644,7 @@ pkg_osvf_new_entry()
	return entry;
}

-
void
+
static void
pkg_osvf_free_pkgname(struct pkg_audit_pkgname *pkgname)
{
	if(!pkgname)
@@ -661,7 +661,7 @@ pkg_osvf_free_pkgname(struct pkg_audit_pkgname *pkgname)
	free(pkgname);
}

-
void
+
static void
pkg_osvf_free_version(struct pkg_audit_version *ver)
{
	if(!ver)
@@ -675,7 +675,7 @@ pkg_osvf_free_version(struct pkg_audit_version *ver)
	free(ver);
}

-
void
+
static void
pkg_osvf_free_range(struct pkg_audit_versions_range *range)
{
	free(range);
@@ -702,7 +702,7 @@ pkg_osvf_free_ecosystem(struct pkg_audit_ecosystem *ecosystem)
	free(ecosystem);
}

-
void
+
static void
pkg_osvf_free_package(struct pkg_audit_package *package)
{
	if(!package)
@@ -725,7 +725,7 @@ pkg_osvf_free_package(struct pkg_audit_package *package)
	free(package);
}

-
void
+
static void
pkg_osvf_free_cve(struct pkg_audit_cve *cve)
{
	if(!cve)
@@ -742,7 +742,7 @@ pkg_osvf_free_cve(struct pkg_audit_cve *cve)
	free(cve);
}

-
void
+
static void
pkg_osvf_free_reference(struct pkg_audit_reference *reference)
{
	if(!reference)
@@ -813,7 +813,7 @@ pkg_osvf_free_entry(struct pkg_audit_entry *entry)
	free(entry);
}

-
struct pkghash *
+
static struct pkghash *
pkg_osvf_create_seek_hash(struct pkg_osvf_hash *osvf_ptr)
{
	struct pkghash *hash_table = pkghash_new();
@@ -827,7 +827,7 @@ pkg_osvf_create_seek_hash(struct pkg_osvf_hash *osvf_ptr)
	return hash_table;
}

-
unsigned int
+
static unsigned int
pkg_osvf_get_hash(const char *key, struct pkg_osvf_hash *global, unsigned int unknow)
{
	struct pkghash *hash = NULL;
@@ -932,8 +932,8 @@ pkg_osvf_get_event(const char *event_type)
}


-
const char *
-
pkg_osvf_ucl_string(const ucl_object_t *obj, char *key)
+
static const char *
+
pkg_osvf_ucl_string(const ucl_object_t *obj, const char *key)
{
	const ucl_object_t *key_obj = ucl_object_find_key(obj, key);

@@ -945,7 +945,7 @@ pkg_osvf_ucl_string(const ucl_object_t *obj, char *key)
	return "";
}

-
void
+
static void
pkg_osvf_parse_package(struct pkg_audit_package *package, const ucl_object_t *package_obj)
{
	/* Parses package structure:
@@ -964,7 +964,7 @@ pkg_osvf_parse_package(struct pkg_audit_package *package, const ucl_object_t *pa
	package->ecosystem = pkg_osvf_get_ecosystem(pkg_osvf_ucl_string(package_obj, "ecosystem"));
}

-
void
+
static void
pkg_osvf_parse_events(struct pkg_audit_versions_range *range, const ucl_object_t *event_array, const char *type)
{
	ucl_object_iter_t it = NULL;
@@ -1006,7 +1006,7 @@ pkg_osvf_parse_events(struct pkg_audit_versions_range *range, const ucl_object_t
}


-
void
+
static void
pkg_osvf_parse_ranges(struct pkg_audit_versions_range *range, const ucl_object_t *range_array)
{
	ucl_object_iter_t it = NULL;
@@ -1053,7 +1053,7 @@ pkg_osvf_parse_ranges(struct pkg_audit_versions_range *range, const ucl_object_t
	}
}

-
void
+
static void
pkg_osvf_parse_reference(struct pkg_audit_reference *ref, const ucl_object_t *ref_obj)
{
	if(!ref_obj || ucl_object_type(ref_obj) != UCL_OBJECT)
@@ -1072,7 +1072,7 @@ pkg_osvf_parse_reference(struct pkg_audit_reference *ref, const ucl_object_t *re
	ref->type = pkg_osvf_get_reference(pkg_osvf_ucl_string(ref_obj, "type"));
}

-
void
+
static void
pkg_osvf_parse_references(struct pkg_audit_entry *entry, const ucl_object_t *ref_obj)
{
	ucl_object_iter_t it = NULL;
@@ -1116,7 +1116,7 @@ pkg_osvf_parse_references(struct pkg_audit_entry *entry, const ucl_object_t *ref

}

-
void
+
static void
pkg_osvf_parse_affected(struct pkg_audit_entry *entry, const ucl_object_t *aff_obj)
{
	ucl_object_iter_t it = NULL;
@@ -1183,7 +1183,7 @@ pkg_osvf_parse_affected(struct pkg_audit_entry *entry, const ucl_object_t *aff_o
	}
}

-
void
+
static void
pkg_osvf_append_version_range(struct pkg_audit_versions_range *to, struct pkg_audit_versions_range *from)
{
	struct pkg_audit_versions_range *ptr_from = from;
@@ -1210,7 +1210,7 @@ pkg_osvf_append_version_range(struct pkg_audit_versions_range *to, struct pkg_au
	}
}

-
void
+
static void
pkg_osvf_print_version_type(struct pkg_audit_versions_range *versions)
{
	if(!versions)
@@ -1236,7 +1236,7 @@ pkg_osvf_print_version_type(struct pkg_audit_versions_range *versions)
	}
}

-
void
+
static void
pkg_osvf_print_version(struct pkg_audit_version *version)
{
	if(!version)
@@ -1266,7 +1266,7 @@ pkg_osvf_print_version(struct pkg_audit_version *version)
	printf("%s\n", version->version);
}

-
void
+
static void
pkg_osvf_print_ecosystem(struct pkg_audit_ecosystem *ecosystem)
{
	ucl_object_iter_t it = NULL;
modified libpkg/pkg_repo_meta.c
@@ -107,7 +107,7 @@ pkg_repo_meta_free(struct pkg_repo_meta *meta)
}

static ucl_object_t*
-
pkg_repo_meta_open_schema_v1()
+
pkg_repo_meta_open_schema_v1(void)
{
	struct ucl_parser *parser;
	static const char meta_schema_str_v1[] = ""
@@ -165,7 +165,7 @@ pkg_repo_meta_open_schema_v1()
}

static ucl_object_t*
-
pkg_repo_meta_open_schema_v2()
+
pkg_repo_meta_open_schema_v2(void)
{
	struct ucl_parser *parser;
	static const char meta_schema_str_v2[] = ""
modified libpkg/pkg_solve.c
@@ -1124,9 +1124,9 @@ reiterate:
		failed = picosat_next_maximal_satisfiable_subset_of_assumptions(problem->sat);

		while (*failed) {
-
			struct pkg_solve_variable *var = &problem->variables[*failed - 1];
+
			struct pkg_solve_variable *lvar = &problem->variables[*failed - 1];

-
			pkg_emit_notice("var: %s", var->uid);
+
			pkg_emit_notice("lvar: %s", lvar->uid);

			failed ++;
		}
@@ -1139,17 +1139,17 @@ reiterate:
		/* Assign vars */
		for (i = 0; i < problem->nvars; i ++) {
			int val = picosat_deref(problem->sat, i + 1);
-
			struct pkg_solve_variable *var = &problem->variables[i];
+
			struct pkg_solve_variable *lvar = &problem->variables[i];

			if (val > 0)
-
				var->flags |= PKG_VAR_INSTALL;
+
				lvar->flags |= PKG_VAR_INSTALL;
			else
-
				var->flags &= ~PKG_VAR_INSTALL;
+
				lvar->flags &= ~PKG_VAR_INSTALL;

			dbg(2, "decided %s %s-%s to %s",
-
					var->unit->pkg->type == PKG_INSTALLED ? "local" : "remote",
-
							var->uid, var->digest,
-
							var->flags & PKG_VAR_INSTALL ? "install" : "delete");
+
					lvar->unit->pkg->type == PKG_INSTALLED ? "local" : "remote",
+
							lvar->uid, lvar->digest,
+
							lvar->flags & PKG_VAR_INSTALL ? "install" : "delete");
		}

		/* Check for reiterations */
@@ -1157,10 +1157,10 @@ reiterate:
				problem->j->type == PKG_JOBS_UPGRADE) && iter == 0) {
			for (i = 0; i < problem->nvars; i ++) {
				bool failed_var = false;
-
				struct pkg_solve_variable *var = &problem->variables[i], *cur;
+
				struct pkg_solve_variable *lvar = &problem->variables[i], *cur;

-
				if (!(var->flags & PKG_VAR_INSTALL)) {
-
					LL_FOREACH(var, cur) {
+
				if (!(lvar->flags & PKG_VAR_INSTALL)) {
+
					LL_FOREACH(lvar, cur) {
						if (cur->flags & PKG_VAR_INSTALL) {
							failed_var = false;
							break;
@@ -1178,10 +1178,10 @@ reiterate:
				if (failed_var) {
					dbg (1, "trying to delete local package %s-%s on install/upgrade,"
							" reiterate on SAT",
-
							var->unit->pkg->name, var->unit->pkg->version);
+
							lvar->unit->pkg->name, lvar->unit->pkg->version);
					need_reiterate = true;

-
					LL_FOREACH(var, cur) {
+
					LL_FOREACH(lvar, cur) {
						cur->flags |= PKG_VAR_FAILED;
					}
				}
@@ -1194,15 +1194,15 @@ reiterate:

		/* Restore top-level assumptions */
		for (i = 0; i < problem->nvars; i ++) {
-
			struct pkg_solve_variable *var = &problem->variables[i];
+
			struct pkg_solve_variable *lvar = &problem->variables[i];

-
			if (var->flags & PKG_VAR_TOP) {
-
				if (var->flags & PKG_VAR_FAILED) {
-
					var->flags ^= PKG_VAR_INSTALL | PKG_VAR_FAILED;
+
			if (lvar->flags & PKG_VAR_TOP) {
+
				if (lvar->flags & PKG_VAR_FAILED) {
+
					lvar->flags ^= PKG_VAR_INSTALL | PKG_VAR_FAILED;
				}

-
				picosat_assume(problem->sat, var->order *
-
						(var->flags & PKG_VAR_INSTALL ? 1 : -1));
+
				picosat_assume(problem->sat, lvar->order *
+
						(lvar->flags & PKG_VAR_INSTALL ? 1 : -1));
			}
		}

modified libpkg/pkg_status.c
@@ -111,9 +111,9 @@ pkg_status(int *count)
static bool
is_exec_at_localbase(const char *progname)
{
-
	char	pkgpath[MAXPATHLEN];
-
	char	*env;
-
	bool	result = true;
+
	char		 pkgpath[MAXPATHLEN];
+
	char const	*env;
+
	bool		 result = true;

	if ((env = getenv("LOCALBASE")) == NULL)
		env = _LOCALBASE;
modified libpkg/scripts.c
@@ -166,11 +166,11 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade, bool noexe
			 * consider cur_pipe[1] to probably be the lastest
			 * opened fd close all unuseful fd up to there
			 */
-
			for (int j = 5; j <= cur_pipe[1]; j++) {
-
				if (j != cur_pipe[0] && j != ctx.devnullfd)
-
					posix_spawn_file_actions_addclose(&action, j);
+
			for (int k = 5; k <= cur_pipe[1]; k++) {
+
				if (k != cur_pipe[0] && k != ctx.devnullfd)
+
					posix_spawn_file_actions_addclose(&action, k);
			}
-
			if (script_len > argmax) {
+
			if (argmax < 0 || script_len > (size_t)argmax) {
				if (pipe(stdin_pipe) < 0) {
					ret = EPKG_FATAL;
					posix_spawn_file_actions_destroy(&action);
modified libpkg/yuarel.c
@@ -33,7 +33,7 @@
static inline int
natoi(const char *str, size_t len)
{
-
	int i, r = 0;
+
	size_t i, r = 0;
	for (i = 0; i < len; i++) {
		r *= 10;
		r += str[i] - '0';