diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-12 03:08:31 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-15 19:11:59 +0200 |
| commit | f3f39cef84330b734c36a60e48cf26a3f3e1f76c (patch) | |
| tree | bda8491253aef025a8543b9348b7aa2bbec866d7 /lib | |
| parent | 7de92cb2232b2fc40c8fe749da78e8920afa0f1f (diff) | |
| download | pacman-f3f39cef84330b734c36a60e48cf26a3f3e1f76c.tar.gz pacman-f3f39cef84330b734c36a60e48cf26a3f3e1f76c.tar.xz | |
Remove checksum access indirection
These items are never present in anything but sync databases, nor do we
even try to load them from the local database. Remvoe the indirection
meant to allow the caching layer to work since it will never do anything
anyway.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libalpm/be_local.c | 14 | ||||
| -rw-r--r-- | lib/libalpm/package.c | 8 | ||||
| -rw-r--r-- | lib/libalpm/package.h | 2 |
3 files changed, 2 insertions, 22 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 67b66f28..fdb4ceaf 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -93,18 +93,6 @@ static const char *_cache_get_packager(alpm_pkg_t *pkg) return pkg->packager; } -static const char *_cache_get_md5sum(alpm_pkg_t *pkg) -{ - LAZY_LOAD(INFRQ_DESC, NULL); - return pkg->md5sum; -} - -static const char *_cache_get_sha256sum(alpm_pkg_t *pkg) -{ - LAZY_LOAD(INFRQ_DESC, NULL); - return pkg->sha256sum; -} - static const char *_cache_get_arch(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_DESC, NULL); @@ -256,8 +244,6 @@ static struct pkg_operations local_pkg_ops = { .get_builddate = _cache_get_builddate, .get_installdate = _cache_get_installdate, .get_packager = _cache_get_packager, - .get_md5sum = _cache_get_md5sum, - .get_sha256sum = _cache_get_sha256sum, .get_arch = _cache_get_arch, .get_size = _cache_get_size, .get_isize = _cache_get_isize, diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index a1bcb7a1..22b5d575 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -91,8 +91,6 @@ static const char *_pkg_get_url(alpm_pkg_t *pkg) { return pkg->url; } static time_t _pkg_get_builddate(alpm_pkg_t *pkg) { return pkg->builddate; } static time_t _pkg_get_installdate(alpm_pkg_t *pkg) { return pkg->installdate; } static const char *_pkg_get_packager(alpm_pkg_t *pkg) { return pkg->packager; } -static const char *_pkg_get_md5sum(alpm_pkg_t *pkg) { return pkg->md5sum; } -static const char *_pkg_get_sha256sum(alpm_pkg_t *pkg) { return pkg->sha256sum; } static const char *_pkg_get_arch(alpm_pkg_t *pkg) { return pkg->arch; } static off_t _pkg_get_size(alpm_pkg_t *pkg) { return pkg->size; } static off_t _pkg_get_isize(alpm_pkg_t *pkg) { return pkg->isize; } @@ -139,8 +137,6 @@ struct pkg_operations default_pkg_ops = { .get_builddate = _pkg_get_builddate, .get_installdate = _pkg_get_installdate, .get_packager = _pkg_get_packager, - .get_md5sum = _pkg_get_md5sum, - .get_sha256sum = _pkg_get_sha256sum, .get_arch = _pkg_get_arch, .get_size = _pkg_get_size, .get_isize = _pkg_get_isize, @@ -228,14 +224,14 @@ const char SYMEXPORT *alpm_pkg_get_md5sum(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); pkg->handle->pm_errno = 0; - return pkg->ops->get_md5sum(pkg); + return pkg->md5sum; } const char SYMEXPORT *alpm_pkg_get_sha256sum(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); pkg->handle->pm_errno = 0; - return pkg->ops->get_sha256sum(pkg); + return pkg->sha256sum; } const char SYMEXPORT *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg) diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index b60bbf76..d17b6a3b 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -54,8 +54,6 @@ struct pkg_operations { time_t (*get_builddate) (alpm_pkg_t *); time_t (*get_installdate) (alpm_pkg_t *); const char *(*get_packager) (alpm_pkg_t *); - const char *(*get_md5sum) (alpm_pkg_t *); - const char *(*get_sha256sum) (alpm_pkg_t *); const char *(*get_arch) (alpm_pkg_t *); off_t (*get_size) (alpm_pkg_t *); off_t (*get_isize) (alpm_pkg_t *); |