diff options
| author | Dan McGee <dan@archlinux.org> | 2008-05-10 13:32:19 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-05-13 18:56:55 -0500 |
| commit | a422f6e39c9c60b89269c2b09e697a9eb142b904 (patch) | |
| tree | a6543b4527584cae06aa69f273c09434e33e520c | |
| parent | f671147282e0f5c6a2e05c8cb7a0d5b72ef8cb61 (diff) | |
Remove lazy init code from pkg name and version functions
If we have a package without name and/or version, we are really out of luck.
Speed these functions up by removing unnecessary code. Note that both the
splitname and pkg_load functions, where the name and version of packages are
initially populated for databases and pkg.tar.gz files respectively, enforce
that every new package struct created has a name and version.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/package.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index c39eae32..86596165 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -130,29 +130,13 @@ const char SYMEXPORT *alpm_pkg_get_filename(pmpkg_t *pkg) const char SYMEXPORT *alpm_pkg_get_name(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - - /* Sanity checks */ - ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); - - if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_BASE)) { - _alpm_db_read(pkg->origin_data.db, pkg, INFRQ_BASE); - } return pkg->name; } const char SYMEXPORT *alpm_pkg_get_version(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - - /* Sanity checks */ - ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); - - if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_BASE)) { - _alpm_db_read(pkg->origin_data.db, pkg, INFRQ_BASE); - } return pkg->version; } |