diff options
| author | Allan McRae <allan@archlinux.org> | 2010-07-07 08:58:51 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-08-24 04:49:05 +0200 |
| commit | 48589ccc64c5e7266f70c6294087e8b0450953e9 (patch) | |
| tree | bf6137c4ac190d71905a094db26f72624cbe923f /lib/libalpm | |
| parent | d896527d21107afe69328ac465a3d2f0e318ddca (diff) | |
| download | pacman-48589ccc64c5e7266f70c6294087e8b0450953e9.tar.gz pacman-48589ccc64c5e7266f70c6294087e8b0450953e9.tar.xz | |
Fix some whitespace issues
The combination of tabs and spaces is annoying in any editor that
does not use a tab width of 2 spaces.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/be_package.c | 2 | ||||
| -rw-r--r-- | lib/libalpm/conflict.c | 2 | ||||
| -rw-r--r-- | lib/libalpm/package.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 7b77ae6b..3d8c4e38 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -230,7 +230,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) goto pkg_invalid; } - archive_read_finish(archive); + archive_read_finish(archive); /* internal fields for package struct */ newpkg->origin = PKG_FROM_FILE; diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 236ec1df..694c38db 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -321,7 +321,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) */ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts, pmfileconflicttype_t type, const char *filestr, - const char* name1, const char* name2) + const char* name1, const char* name2) { pmfileconflict_t *conflict; MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c8946448..14f81f92 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -67,10 +67,10 @@ struct __pmpkg_t { /* internal */ pmpkgfrom_t origin; /* Replaced 'void *data' with this union as follows: - origin == PKG_FROM_CACHE, use pkg->origin_data.db - origin == PKG_FROM_FILE, use pkg->origin_data.file + origin == PKG_FROM_CACHE, use pkg->origin_data.db + origin == PKG_FROM_FILE, use pkg->origin_data.file */ - union { + union { pmdb_t *db; char *file; } origin_data; |