diff options
| author | Allan McRae <allan@archlinux.org> | 2011-06-28 06:39:43 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-06-28 15:28:23 +0200 |
| commit | cd1e39ba62ea564c1c29a918aa1a4d6aac9a351e (patch) | |
| tree | 48878228b113af5520b72d27770499f13b65d284 /lib/libalpm/add.c | |
| parent | bfe1771067e372420d857094befd6c6ea5b28495 (diff) | |
| download | pacman-cd1e39ba62ea564c1c29a918aa1a4d6aac9a351e.tar.gz pacman-cd1e39ba62ea564c1c29a918aa1a4d6aac9a351e.tar.xz | |
Rename pmbackup_t to alpm_backup_t
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 3455744f..b8b1ca18 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -252,7 +252,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(alpm_list_find_str(handle->noupgrade, entryname)) { notouch = 1; } else { - pmbackup_t *backup; + alpm_backup_t *backup; /* go to the backup array and see if our conflict is there */ /* check newpkg first, so that adding backup files is retroactive */ backup = _alpm_needbackup(entryname, alpm_pkg_get_backup(newpkg)); @@ -303,7 +303,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* update the md5 hash in newpkg's backup (it will be the new orginal) */ alpm_list_t *i; for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) { - pmbackup_t *backup = i->data; + alpm_backup_t *backup = i->data; char *newhash; if(!backup->name || strcmp(backup->name, entryname_orig) != 0) { continue; @@ -435,7 +435,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* calculate an hash if this is in newpkg's backup */ alpm_list_t *i; for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) { - pmbackup_t *backup = i->data; + alpm_backup_t *backup = i->data; char *newhash; if(!backup->name || strcmp(backup->name, entryname_orig) != 0) { continue; |