Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Remove useless use of sbuf Remove useless accessors
Baptiste Daroussin committed 11 years ago
commit 5e3dcb36dbe0d1f79c9641400672a3cbe24d983f
parent d2b47ebd147daa2a1654677ba43b6d4c411646bd
8 files changed +9 -23
modified libpkg/pkg.c
@@ -1350,11 +1350,9 @@ pkg_addprovide(struct pkg *pkg, const char *name)
		return (EPKG_OK);



	pkg_provide_new(&p);
- 
	sbuf_set(&p->provide, name);
+ 
	p->provide = strdup(name);
- 
	HASH_ADD_KEYPTR(hh, pkg->provides,
- 
	    __DECONST(char *, pkg_provide_name(p)),
- 
	    sbuf_size(p->provide), p);
+ 
	HASH_ADD_KEYPTR(hh, pkg->provides, p->provide, strlen(p->provide), p);



	return (EPKG_OK);

}
modified libpkg/pkg.h.in
@@ -758,9 +758,6 @@ const char *pkg_option_value(struct pkg_option const * const);
const char *pkg_option_default_value(struct pkg_option const * const);

const char *pkg_option_description(struct pkg_option const * const);
- 
/* pkg_provide */
- 
const char *pkg_provide_name(const struct pkg_provide *);
- 


/**

 * @param db A pointer to a struct pkgdb object

 * @param origin Package origin
modified libpkg/pkg_attributes.c
@@ -305,18 +305,10 @@ pkg_provide_free(struct pkg_provide *c)
	if (c == NULL)

		return;
- 
	sbuf_free(c->provide);
+ 
	free(c->provide);

	free(c);

}
- 
const char *
- 
pkg_provide_name(const struct pkg_provide *c)
- 
{
- 
	assert(c != NULL);
-
- 
	return (sbuf_get(c->provide));
- 
}
- 


/*

 * Config files

 */
modified libpkg/pkg_cudf.c
@@ -142,7 +142,7 @@ cudf_emit_pkg(struct pkg *pkg, int version, FILE *f,
		if (fprintf(f, "provides: ") < 0)

			return (EPKG_FATAL);

		HASH_ITER(hh, pkg->provides, prov, ptmp) {
- 
			if (cudf_print_element(f, pkg_provide_name(prov),
+ 
			if (cudf_print_element(f, prov->provide,

					(prov->hh.next != NULL), &column) < 0) {

				return (EPKG_FATAL);

			}
modified libpkg/pkg_jobs.c
@@ -1135,8 +1135,7 @@ pkg_jobs_need_upgrade(struct pkg *rp, struct pkg *lp)
			return (true);

		}

		if (ret1 == EPKG_OK) {
- 
			if (strcmp(pkg_provide_name(rpr),
- 
					pkg_provide_name(lpr)) != 0) {
+ 
			if (strcmp(rpr->provide, lpr->provide) != 0) {

				free(rp->reason);

				rp->reason = strdup("provides changed");

				return (true);
modified libpkg/pkg_manifest.c
@@ -1081,7 +1081,7 @@ pkg_emit_object(struct pkg *pkg, short flags)
			map = ucl_object_typed_new(UCL_OBJECT);

		ucl_object_insert_key(map,

		    ucl_object_fromstring(pkg_option_value(option)),
- 
		    pkg_provide_name(provide), 0, false);
+ 
		    provide->provide, 0, false);

	}

	if (map)

		ucl_object_insert_key(top, map, "provides", 8, false);
modified libpkg/pkgdb.c
@@ -1915,10 +1915,10 @@ pkgdb_update_provides(struct pkg *pkg, int64_t package_id, sqlite3 *s)
	struct pkg_provide	*provide = NULL;



	while (pkg_provides(pkg, &provide) == EPKG_OK) {
- 
		if (run_prstmt(PROVIDE, pkg_provide_name(provide))
+ 
		if (run_prstmt(PROVIDE, provide->provide)

		    != SQLITE_DONE

		    ||
- 
		    run_prstmt(PKG_PROVIDE, package_id, pkg_provide_name(provide))
+ 
		    run_prstmt(PKG_PROVIDE, package_id, provide->provide)

		    != SQLITE_DONE) {

			ERROR_SQLITE(s, SQL(PKG_PROVIDE));

			return (EPKG_FATAL);
modified libpkg/private/pkg.h
@@ -207,7 +207,7 @@ struct pkg_conflict {
};



struct pkg_provide {
- 
	struct sbuf		*provide;
+ 
	char	*provide;

	UT_hash_handle	hh;

};