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

When setting package name, set hash value as well

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2010-12-14 12:06:31 -06:00
parent dbf59a6b14
commit c2a73ba989
4 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/libalpm/be_package.c
View file

@ -179,6 +179,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
ptr = _alpm_strtrim(ptr); ptr = _alpm_strtrim(ptr);
if(strcmp(key, "pkgname") == 0) { if(strcmp(key, "pkgname") == 0) {
STRDUP(newpkg->name, ptr, RET_ERR(PM_ERR_MEMORY, -1)); STRDUP(newpkg->name, ptr, RET_ERR(PM_ERR_MEMORY, -1));
newpkg->name_hash = _alpm_hash_sdbm(newpkg->name);
} else if(strcmp(key, "pkgver") == 0) { } else if(strcmp(key, "pkgver") == 0) {
STRDUP(newpkg->version, ptr, RET_ERR(PM_ERR_MEMORY, -1)); STRDUP(newpkg->version, ptr, RET_ERR(PM_ERR_MEMORY, -1));
} else if(strcmp(key, "pkgdesc") == 0) { } else if(strcmp(key, "pkgdesc") == 0) {

1
lib/libalpm/package.c
View file

@ -414,6 +414,7 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg)
CALLOC(newpkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL)); CALLOC(newpkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL));
newpkg->name_hash = pkg->name_hash;
STRDUP(newpkg->filename, pkg->filename, RET_ERR(PM_ERR_MEMORY, newpkg)); STRDUP(newpkg->filename, pkg->filename, RET_ERR(PM_ERR_MEMORY, newpkg));
STRDUP(newpkg->name, pkg->name, RET_ERR(PM_ERR_MEMORY, newpkg)); STRDUP(newpkg->name, pkg->name, RET_ERR(PM_ERR_MEMORY, newpkg));
STRDUP(newpkg->version, pkg->version, RET_ERR(PM_ERR_MEMORY, newpkg)); STRDUP(newpkg->version, pkg->version, RET_ERR(PM_ERR_MEMORY, newpkg));

1
lib/libalpm/package.h
View file

@ -89,6 +89,7 @@ struct pkg_operations {
extern struct pkg_operations default_pkg_ops; extern struct pkg_operations default_pkg_ops;
struct __pmpkg_t { struct __pmpkg_t {
unsigned long name_hash;
char *filename; char *filename;
char *name; char *name;
char *version; char *version;

1
lib/libalpm/util.c
View file

@ -840,6 +840,7 @@ int _alpm_splitname(const char *target, pmpkg_t *pkg)
FREE(pkg->name); FREE(pkg->name);
} }
STRDUP(pkg->name, tmp, RET_ERR(PM_ERR_MEMORY, -1)); STRDUP(pkg->name, tmp, RET_ERR(PM_ERR_MEMORY, -1));
pkg->name_hash = _alpm_hash_sdbm(pkg->name);
free(tmp); free(tmp);
return(0); return(0);