bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify _alpm_pkg_new()

Browse source 
Any real call of this function doesn't specify a name or version ahead of
time, so just kill that functionality off. Now to remove those dummy
packages...

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2008-05-13 19:03:54 -05:00
parent a422f6e39c
commit dd98aa8564
5 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libalpm/be_files.c
View file

@ -298,7 +298,7 @@ int _alpm_db_populate(pmdb_t *db)
continue; continue;
} }
pkg = _alpm_pkg_new(NULL, NULL); pkg = _alpm_pkg_new();
if(pkg == NULL) { if(pkg == NULL) {
return(-1); return(-1);
} }

2
lib/libalpm/be_package.c
View file

@ -156,7 +156,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, unsigned short full)
RET_ERR(PM_ERR_PKG_OPEN, NULL); RET_ERR(PM_ERR_PKG_OPEN, NULL);
} }
newpkg = _alpm_pkg_new(NULL, NULL); newpkg = _alpm_pkg_new();
if(newpkg == NULL) { if(newpkg == NULL) {
archive_read_finish(archive); archive_read_finish(archive);
RET_ERR(PM_ERR_MEMORY, NULL); RET_ERR(PM_ERR_MEMORY, NULL);

6
lib/libalpm/deps.c
View file

@ -598,7 +598,8 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
} }
/* If package is in the ignorepkg list, ask before we pull it */ /* If package is in the ignorepkg list, ask before we pull it */
if(_alpm_pkg_should_ignore(sync)) { if(_alpm_pkg_should_ignore(sync)) {
pmpkg_t *dummypkg = _alpm_pkg_new(miss->target, NULL); pmpkg_t *dummypkg = _alpm_pkg_new();
STRDUP(dummypkg->name, miss->target, RET_ERR(PM_ERR_MEMORY, -1));
QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &found); QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &found);
_alpm_pkg_free(dummypkg); _alpm_pkg_free(dummypkg);
} }
@ -620,7 +621,8 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
continue; continue;
} }
if(_alpm_pkg_should_ignore(sync)) { if(_alpm_pkg_should_ignore(sync)) {
pmpkg_t *dummypkg = _alpm_pkg_new(miss->target, NULL); pmpkg_t *dummypkg = _alpm_pkg_new();
STRDUP(dummypkg->name, miss->target, RET_ERR(PM_ERR_MEMORY, -1));
QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &found); QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &found);
_alpm_pkg_free(dummypkg); _alpm_pkg_free(dummypkg);
} }

10
lib/libalpm/package.c
View file

@ -680,7 +680,7 @@ int _alpm_versioncmp(const char *a, const char *b)
} }
pmpkg_t *_alpm_pkg_new(const char *name, const char *version) pmpkg_t *_alpm_pkg_new(void)
{ {
pmpkg_t* pkg; pmpkg_t* pkg;
@ -688,14 +688,6 @@ pmpkg_t *_alpm_pkg_new(const char *name, const char *version)
CALLOC(pkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL)); CALLOC(pkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL));
if(name) {
STRDUP(pkg->name, name, RET_ERR(PM_ERR_MEMORY, pkg));
}
if(version) {
STRDUP(pkg->version, version, RET_ERR(PM_ERR_MEMORY, pkg));
}
return(pkg); return(pkg);
} }

2
lib/libalpm/package.h
View file

@ -75,7 +75,7 @@ struct __pmpkg_t {
}; };
int _alpm_versioncmp(const char *a, const char *b); int _alpm_versioncmp(const char *a, const char *b);
pmpkg_t* _alpm_pkg_new(const char *name, const char *version); pmpkg_t* _alpm_pkg_new(void);
pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg); pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg);
void _alpm_pkg_free(pmpkg_t *pkg); void _alpm_pkg_free(pmpkg_t *pkg);
int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_cmp(const void *p1, const void *p2);