kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libarchive: Rename isoent_rr_move_dir parameter isoent => curent 

The PGI compiler confuses parameter name "isoent" with "struct isoent".
Rename the parameter to "curent" to avoid confusion.
This commit is contained in:
Brad King 2012-01-04 09:48:41 -05:00
parent b6ca96ec95
commit 2309438321
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
View File

@ -6619,7 +6619,7 @@ isoent_collect_dirs(struct vdd *vdd, struct isoent *rootent, int depth)
*/ */
static int static int
isoent_rr_move_dir(struct archive_write *a, struct isoent **rr_moved, isoent_rr_move_dir(struct archive_write *a, struct isoent **rr_moved,
struct isoent *isoent, struct isoent **newent) struct isoent *curent, struct isoent **newent)
{ {
struct iso9660 *iso9660 = a->format_data; struct iso9660 *iso9660 = a->format_data;
struct isoent *rrmoved, *mvent, *np; struct isoent *rrmoved, *mvent, *np;
@ -6645,40 +6645,40 @@ isoent_rr_move_dir(struct archive_write *a, struct isoent **rr_moved,
*rr_moved = rrmoved; *rr_moved = rrmoved;
} }
/* /*
* Make a clone of isoent which is going to be relocated * Make a clone of curent which is going to be relocated
* to rr_moved. * to rr_moved.
*/ */
mvent = isoent_clone(isoent); mvent = isoent_clone(curent);
if (mvent == NULL) { if (mvent == NULL) {
archive_set_error(&a->archive, ENOMEM, archive_set_error(&a->archive, ENOMEM,
"Can't allocate memory"); "Can't allocate memory");
return (ARCHIVE_FATAL); return (ARCHIVE_FATAL);
} }
/* linking.. and use for creating "CL", "PL" and "RE" */ /* linking.. and use for creating "CL", "PL" and "RE" */
mvent->rr_parent = isoent->parent; mvent->rr_parent = curent->parent;
isoent->rr_child = mvent; curent->rr_child = mvent;
/* /*
* Move subdirectories from the isoent to mvent * Move subdirectories from the curent to mvent
*/ */
if (isoent->children.first != NULL) { if (curent->children.first != NULL) {
*mvent->children.last = isoent->children.first; *mvent->children.last = curent->children.first;
mvent->children.last = isoent->children.last; mvent->children.last = curent->children.last;
} }
for (np = mvent->children.first; np != NULL; np = np->chnext) for (np = mvent->children.first; np != NULL; np = np->chnext)
np->parent = mvent; np->parent = mvent;
mvent->children.cnt = isoent->children.cnt; mvent->children.cnt = curent->children.cnt;
isoent->children.cnt = 0; curent->children.cnt = 0;
isoent->children.first = NULL; curent->children.first = NULL;
isoent->children.last = &isoent->children.first; curent->children.last = &curent->children.first;
if (isoent->subdirs.first != NULL) { if (curent->subdirs.first != NULL) {
*mvent->subdirs.last = isoent->subdirs.first; *mvent->subdirs.last = curent->subdirs.first;
mvent->subdirs.last = isoent->subdirs.last; mvent->subdirs.last = curent->subdirs.last;
} }
mvent->subdirs.cnt = isoent->subdirs.cnt; mvent->subdirs.cnt = curent->subdirs.cnt;
isoent->subdirs.cnt = 0; curent->subdirs.cnt = 0;
isoent->subdirs.first = NULL; curent->subdirs.first = NULL;
isoent->subdirs.last = &isoent->subdirs.first; curent->subdirs.last = &curent->subdirs.first;
/* /*
* The mvent becomes a child of the rr_moved entry. * The mvent becomes a child of the rr_moved entry.
@ -6691,7 +6691,7 @@ isoent_rr_move_dir(struct archive_write *a, struct isoent **rr_moved,
* has to set the flag as a file. * has to set the flag as a file.
* See also RRIP 4.1.5.1 Description of the "CL" System Use Entry. * See also RRIP 4.1.5.1 Description of the "CL" System Use Entry.
*/ */
isoent->dir = 0; curent->dir = 0;
*newent = mvent; *newent = mvent;