Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2772d8a
API: remove ancient api pkg_get()
Baptiste Daroussin committed 4 years ago
commit 2772d8a0d8a58bfeecfe12fd0551ed79ea2c0593
parent b5eefda
3 files changed +0 -139
modified libpkg/libpkg.ver
@@ -56,7 +56,6 @@ global:
	pkg_finish_repo;

	pkg_fprintf;

	pkg_free;
- 
	pkg_get2;

	pkg_get_cachedir;

	pkg_get_cachedirfd;

	pkg_get_dbdirfd;
modified libpkg/pkg.c
@@ -174,136 +174,6 @@ pkg_is_valid(const struct pkg * restrict pkg)
}



static int
- 
pkg_vget(const struct pkg * restrict pkg, va_list ap)
- 
{
- 
	int attr;
-
- 
	while ((attr = va_arg(ap, int)) > 0) {
-
- 
		if (attr >= PKG_NUM_FIELDS || attr <= 0) {
- 
			pkg_emit_error("Bad argument on pkg_get %d", attr);
- 
			return (EPKG_FATAL);
- 
		}
-
- 
		switch (attr) {
- 
		case PKG_ORIGIN:
- 
			*va_arg(ap, const char **) = pkg->origin;
- 
			break;
- 
		case PKG_NAME:
- 
			*va_arg(ap, const char **) = pkg->name;
- 
			break;
- 
		case PKG_VERSION:
- 
			*va_arg(ap, const char **) = pkg->version;
- 
			break;
- 
		case PKG_COMMENT:
- 
			*va_arg(ap, const char **) = pkg->comment;
- 
			break;
- 
		case PKG_DESC:
- 
			*va_arg(ap, const char **) = pkg->desc;
- 
			break;
- 
		case PKG_MTREE:
- 
			*va_arg(ap, const char **) = NULL;
- 
			break;
- 
		case PKG_MESSAGE:
- 
			*va_arg(ap, const char **) = pkg->message ? pkg->message->str : NULL;
- 
			break;
- 
		case PKG_ARCH:
- 
			*va_arg(ap, const char **) = pkg->arch;
- 
			break;
- 
		case PKG_ABI:
- 
			*va_arg(ap, const char **) = pkg->abi;
- 
			break;
- 
		case PKG_WWW:
- 
			*va_arg(ap, const char **) = pkg->www;
- 
			break;
- 
		case PKG_MAINTAINER:
- 
			*va_arg(ap, const char **) = pkg->maintainer;
- 
			break;
- 
		case PKG_PREFIX:
- 
			*va_arg(ap, const char **) = pkg->prefix;
- 
			break;
- 
		case PKG_REPOPATH:
- 
			*va_arg(ap, const char **) = pkg->repopath;
- 
			break;
- 
		case PKG_CKSUM:
- 
			*va_arg(ap, const char **) = pkg->sum;
- 
			break;
- 
		case PKG_OLD_VERSION:
- 
			*va_arg(ap, const char **) = pkg->old_version;
- 
			break;
- 
		case PKG_REPONAME:
- 
			*va_arg(ap, const char **) = pkg->reponame;
- 
			break;
- 
		case PKG_REPOURL:
- 
			*va_arg(ap, const char **) = pkg->repourl;
- 
			break;
- 
		case PKG_DIGEST:
- 
			*va_arg(ap, const char **) = pkg->digest;
- 
			break;
- 
		case PKG_REASON:
- 
			*va_arg(ap, const char **) = pkg->reason;
- 
			break;
- 
		case PKG_FLATSIZE:
- 
			*va_arg(ap, int64_t *) = pkg->flatsize;
- 
			break;
- 
		case PKG_OLD_FLATSIZE:
- 
			*va_arg(ap, int64_t *) = pkg->old_flatsize;
- 
			break;
- 
		case PKG_PKGSIZE:
- 
			*va_arg(ap, int64_t *) = pkg->pkgsize;
- 
			break;
- 
		case PKG_LICENSE_LOGIC:
- 
			*va_arg(ap, lic_t *) = pkg->licenselogic;
- 
			break;
- 
		case PKG_AUTOMATIC:
- 
			*va_arg(ap, bool *) = pkg->automatic;
- 
			break;
- 
		case PKG_LOCKED:
- 
			*va_arg(ap, bool *) = pkg->locked;
- 
			break;
- 
		case PKG_ROWID:
- 
			*va_arg(ap, int64_t *) = pkg->id;
- 
			break;
- 
		case PKG_TIME:
- 
			*va_arg(ap, int64_t *) = pkg->timestamp;
- 
			break;
- 
		case PKG_ANNOTATIONS:
- 
			*va_arg(ap, const struct pkg_kv **) = pkg->annotations;
- 
			break;
- 
		case PKG_UNIQUEID:
- 
			*va_arg(ap, const char **) = pkg->uid;
- 
			break;
- 
		case PKG_OLD_DIGEST:
- 
			*va_arg(ap, const char **) = pkg->old_digest;
- 
			break;
- 
		case PKG_DEP_FORMULA:
- 
			*va_arg(ap, const char **) = pkg->dep_formula;
- 
			break;
- 
		case PKG_VITAL:
- 
			*va_arg(ap, bool *) = pkg->vital;
- 
			break;
- 
		}
- 
	}
-
- 
	return (EPKG_OK);
- 
}
-
- 
int
- 
pkg_get2(const struct pkg * restrict pkg, ...)
- 
{
- 
	int ret = EPKG_OK;
- 
	va_list ap;
-
- 
	assert(pkg != NULL);
-
- 
	va_start(ap, pkg);
- 
	ret = pkg_vget(pkg, ap);
- 
	va_end(ap);
-
- 
	return (ret);
- 
}
-
- 
static int

pkg_vset(struct pkg *pkg, va_list ap)

{

	int attr;
modified libpkg/pkg.h.in
@@ -639,14 +639,6 @@ int pkg_open_fd(struct pkg **p, int fd, struct pkg_manifest_key *keys, int flags
 */

pkg_t pkg_type(const struct pkg * restrict);
- 
/**
- 
 * Generic getter for simple attributes.
- 
 * @return NULL-terminated string.
- 
 * @warning May return a NULL pointer.
- 
 */
- 
int pkg_get2(struct pkg const *const, ...);
- 
#define pkg_get(pkg, ...) pkg_get2(pkg, __VA_ARGS__, -1)
- 


int pkg_list_count(const struct pkg *, pkg_list);



/**