diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-11-02 03:29:10 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-11-02 03:29:10 +0100 |
| commit | fbf1aa653984be4a15714a0efe3acf756daf2d57 (patch) | |
| tree | da4f9d026482393f281c627e30e95a740fa48398 /src/pacman/query.c | |
| parent | 22ce4a2a006d652219e688c6f082a65366051f71 (diff) | |
| download | pacman-fbf1aa653984be4a15714a0efe3acf756daf2d57.tar.gz pacman-fbf1aa653984be4a15714a0efe3acf756daf2d57.tar.xz | |
* Fixed some alpm_get_option calls (long params were used for C99 compliance,
but were used in error)
* Cleaned up some output newlines
* Added "local database is up to date" when no packages are upgraded
Diffstat (limited to 'src/pacman/query.c')
| -rw-r--r-- | src/pacman/query.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/pacman/query.c b/src/pacman/query.c index 48d4cde5..1736a935 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -63,7 +63,7 @@ static int query_fileowner(PM_DB *db, char *filename) } alpm_get_option(PM_OPT_ROOT, &lroot); - root = (void *)&lroot; + root = (char *)lroot; for(lp = alpm_db_getpkgcache(db); lp && !gotcha; lp = alpm_list_next(lp)) { PM_PKG *info; @@ -74,9 +74,10 @@ static int query_fileowner(PM_DB *db, char *filename) for(i = alpm_pkg_getinfo(info, PM_PKG_FILES); i && !gotcha; i = alpm_list_next(i)) { char path[PATH_MAX]; - snprintf(path, PATH_MAX, "%s%s", root, (char *)alpm_list_getdata(i)); + char *filename = (char *)alpm_list_getdata(i); + snprintf(path, PATH_MAX, "%s%s", root, filename); if(!strcmp(path, rpath)) { - printf(_("%s is owned by %s %s\n"), filename, (char *)alpm_pkg_getinfo(info, PM_PKG_NAME), + printf(_("%s is owned by %s %s\n"), path, (char *)alpm_pkg_getinfo(info, PM_PKG_NAME), (char *)alpm_pkg_getinfo(info, PM_PKG_VERSION)); gotcha = 1; break; @@ -266,7 +267,7 @@ int pacman_query(list_t *targets) long ldbpath; char *dbpath; alpm_get_option(PM_OPT_DBPATH, &ldbpath); - dbpath = (void *)&ldbpath; + dbpath = (char *)ldbpath; snprintf(changelog, PATH_MAX, "%s%s/%s/%s-%s/changelog", config->root, dbpath, (char*)alpm_db_getinfo(db_local, PM_DB_TREENAME), |