Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=b8c79e36b7f4dc3e6dd54e3dc7405475fe289111
commit b8c79e36b7f4dc3e6dd54e3dc7405475fe289111 Author: Michel Hermier <[email protected]> Date: Thu Apr 24 08:41:48 2014 +0200 libpacman: Add _pacman_object_alloc. diff --git a/lib/libpacman/object.c b/lib/libpacman/object.c index 4c4ac6b..94d4eaa 100644 --- a/lib/libpacman/object.c +++ b/lib/libpacman/object.c @@ -27,6 +27,18 @@ #include <fstdlib.h> +struct __pmobject_t *_pacman_object_alloc(size_t size, const struct __pmobject_operations_t *object_operations, struct __pmobject_private_t *object_private) +{ + struct __pmobject_t *ret; + + ASSERT(size >= sizeof(*ret), RET_ERR(PM_ERR_WRONG_ARGS, NULL)); + + if((ret = _pacman_objectmemory_alloc(size, object_operations)) != NULL) { + ret->object_private = object_private; + } + return ret; +} + int _pacman_object_delete(struct __pmobject_t *self) { ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); diff --git a/lib/libpacman/object.h b/lib/libpacman/object.h index 0d73b18..ec396d5 100644 --- a/lib/libpacman/object.h +++ b/lib/libpacman/object.h @@ -41,6 +41,8 @@ struct __pmobject_t struct __pmobject_private_t *object_private; }; +struct __pmobject_t *_pacman_object_alloc(size_t size, const struct __pmobject_operations_t *object_operations, struct __pmobject_private_t *object_private); + int _pacman_object_delete(struct __pmobject_t *self); int _pacman_object_init(struct __pmobject_t *self, struct __pmobject_private_t *object_private); diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c index 6fda0d7..db0715c 100644 --- a/lib/libpacman/package.c +++ b/lib/libpacman/package.c @@ -99,6 +99,17 @@ unsigned int _pacman_pkg_parm_to_flag(unsigned char parm) } */ +pmpkg_t *_pacman_pkg_alloc(size_t size, const struct __pmpkg_operations_t *package_operations) +{ + pmpkg_t *ret; + + ASSERT(size >= sizeof(*ret), RET_ERR(PM_ERR_WRONG_ARGS, NULL)); + ASSERT(package_operations != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); + + ret = (pmpkg_t *)_pacman_object_alloc(size, &package_operations->as_pmobject_operations_t, NULL); + return ret; +} + pmpkg_t *_pacman_pkg_new(const char *name, const char *version) { pmpkg_t* pkg = NULL; diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 505c261..7eeeae8 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -137,6 +137,8 @@ do { \ #define FREELISTPKGS(p) _FREELIST(p, _pacman_pkg_delete) +pmpkg_t *_pacman_pkg_alloc(size_t size, const struct __pmpkg_operations_t *package_operations); + pmpkg_t *_pacman_pkg_new(const char *name, const char *version); pmpkg_t *_pacman_pkg_new_from_filename(const char *filename, int witharch); pmpkg_t *_pacman_pkg_dup(pmpkg_t *pkg); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
