Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=20677690c62da6b4161cbdb836ed539ba67eb72d
commit 20677690c62da6b4161cbdb836ed539ba67eb72d Author: Michel Hermier <[email protected]> Date: Mon Apr 28 07:31:18 2014 +0200 libpacman: s/libpacman::Package *_pacman_pkg_new(const char *name, const char *version)/libpacman::Package::Package(const char *name, const char *version)/ diff --git a/lib/libpacman/db/fakedb.cpp b/lib/libpacman/db/fakedb.cpp index 46078f5..b9735b6 100644 --- a/lib/libpacman/db/fakedb.cpp +++ b/lib/libpacman/db/fakedb.cpp @@ -44,7 +44,7 @@ static Package *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name) char *str = NULL; Package *dummy = NULL; - dummy = _pacman_pkg_new(NULL, NULL); + dummy = new Package(NULL, NULL); if(dummy == NULL) { RET_ERR(PM_ERR_MEMORY, NULL); } diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index b0d93b5..ac279af 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -548,7 +548,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) } } if(!needed) { - Package *pkg = _pacman_pkg_new(dep->name, dep->version); + Package *pkg = new Package(dep->name, dep->version); if(pkg == NULL) { continue; } @@ -649,7 +649,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, */ int usedep = 1; if(_pacman_list_is_strin(ps->name, handle->ignorepkg)) { - Package *dummypkg = _pacman_pkg_new(miss->target, NULL); + Package *dummypkg = new Package(miss->target, NULL); QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, ps, NULL, &usedep); FREEPKG(dummypkg); } diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 39c7613..ead6a11 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -52,6 +52,16 @@ Package::Package() { } +Package::Package(const char *name, const char *version) +{ + if(!_pacman_strempty(name)) { + STRNCPY(this->name, name, PKG_NAME_LEN); + } + if(!_pacman_strempty(version)) { + STRNCPY(this->version, version, PKG_VERSION_LEN); + } +} + Package::~Package() { } @@ -109,29 +119,11 @@ unsigned int _pacman_pkg_parm_to_flag(unsigned char parm) } */ -Package *_pacman_pkg_new(const char *name, const char *version) -{ - Package* pkg = NULL; - - if((pkg = (Package *)f_zalloc(sizeof(Package))) == NULL) { - return NULL; - } - - if(!_pacman_strempty(name)) { - STRNCPY(pkg->name, name, PKG_NAME_LEN); - } - if(!_pacman_strempty(version)) { - STRNCPY(pkg->version, version, PKG_VERSION_LEN); - } - - return(pkg); -} - Package *_pacman_pkg_new_from_filename(const char *filename, int witharch) { Package *pkg; - ASSERT(pkg = _pacman_pkg_new(NULL, NULL), return NULL); + ASSERT(pkg = new Package(NULL, NULL), return NULL); if(_pacman_pkg_splitname(filename, pkg->name, pkg->version, witharch) == -1) { _pacman_pkg_delete(pkg); diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index ec24ef5..0de6772 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -92,6 +92,7 @@ class Package { public: Package(); + Package(const char *name, const char *version); virtual ~Package(); virtual int read(unsigned int flags); @@ -148,7 +149,6 @@ do { \ #define FREELISTPKGS(p) _FREELIST(p, _pacman_pkg_delete) -libpacman::Package *_pacman_pkg_new(const char *name, const char *version); libpacman::Package *_pacman_pkg_new_from_filename(const char *filename, int witharch); libpacman::Package *_pacman_pkg_dup(libpacman::Package *pkg); int _pacman_pkg_delete(libpacman::Package *self); diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 927ecd0..5f5aed5 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -167,7 +167,7 @@ Package *_pacman_fpmpackage_load(const char *pkgfile) if((archive = _pacman_archive_read_open_all_file(pkgfile)) == NULL) { RET_ERR(PM_ERR_PKG_OPEN, NULL); } - info = _pacman_pkg_new(NULL, NULL); + info = new Package(NULL, NULL); if(info == NULL) { archive_read_finish (archive); RET_ERR(PM_ERR_MEMORY, NULL); diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index 38db513..ae85337 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -188,7 +188,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) pmsyncpkg_t *ps; if(pkg_local) { - dummy = _pacman_pkg_new(pkg_local->name, pkg_local->version); + dummy = new Package(pkg_local->name, pkg_local->version); if(dummy == NULL) { RET_ERR(PM_ERR_MEMORY, -1); } @@ -431,7 +431,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) asked = _pacman_stringlist_append(asked, miss->depend.name); if(doremove) { pmsyncpkg_t *rsync = _pacman_trans_find(trans, miss->depend.name); - Package *q = _pacman_pkg_new(miss->depend.name, NULL); + Package *q = new Package(miss->depend.name, NULL); if(q == NULL) { if(data) { FREELIST(*data); diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index c28bf0f..37ebd35 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1086,7 +1086,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) _pacman_log(PM_LOG_FLOW1, _("upgrading package %s-%s"), pkg_new->name, pkg_new->version); /* we'll need to save some record for backup checks later */ - oldpkg = _pacman_pkg_new(pkg_local->name, pkg_local->version); + oldpkg = new Package(pkg_local->name, pkg_local->version); if(oldpkg) { if(!(pkg_local->infolevel & INFRQ_FILES)) { _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg_local->name); diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index 80c50eb..89dcdef 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -107,7 +107,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) * the package to replace. */ pmsyncpkg_t *ps; - Package *dummy = _pacman_pkg_new(lpkg->name, NULL); + Package *dummy = new Package(lpkg->name, NULL); if(dummy == NULL) { pm_errno = PM_ERR_MEMORY; goto error; @@ -196,7 +196,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) local->name, local->version, local->version, spkg->version); /* check if spkg->name is already in the packages list. */ if(!_pacman_trans_find(trans, spkg->name)) { - Package *dummy = _pacman_pkg_new(local->name, local->version); + Package *dummy = new Package(local->name, local->version); if(dummy == NULL) { goto error; } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
