From 22611bff4c98146ce2abec903840788da6f3b2b9 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 31 May 2015 10:03:09 -0500 Subject: [PATCH 1/1] Rename tmp_flag => d_tmp_flag --- include/wimlib/dentry.h | 2 +- src/extract.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index 0908b445..9a2b1bd8 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -80,7 +80,7 @@ struct wim_dentry { u8 d_is_win32_name : 1; /* Temporary flag; always reset to 0 when done using. */ - u8 tmp_flag : 1; + u8 d_tmp_flag : 1; /* Used by wimlib_update_image() */ u8 is_orphan : 1; diff --git a/src/extract.c b/src/extract.c index 0401758b..b2348764 100644 --- a/src/extract.c +++ b/src/extract.c @@ -522,14 +522,14 @@ remove_duplicate_trees(struct wim_dentry **trees, size_t num_trees) { size_t i, j = 0; for (i = 0; i < num_trees; i++) { - if (!trees[i]->tmp_flag) { + if (!trees[i]->d_tmp_flag) { /* Found distinct dentry. */ - trees[i]->tmp_flag = 1; + trees[i]->d_tmp_flag = 1; trees[j++] = trees[i]; } } for (i = 0; i < j; i++) - trees[i]->tmp_flag = 0; + trees[i]->d_tmp_flag = 0; return j; } @@ -543,23 +543,23 @@ remove_contained_trees(struct wim_dentry **trees, size_t num_trees) { size_t i, j = 0; for (i = 0; i < num_trees; i++) - trees[i]->tmp_flag = 1; + trees[i]->d_tmp_flag = 1; for (i = 0; i < num_trees; i++) { struct wim_dentry *d = trees[i]; while (!dentry_is_root(d)) { d = d->d_parent; - if (d->tmp_flag) + if (d->d_tmp_flag) goto tree_contained; } trees[j++] = trees[i]; continue; tree_contained: - trees[i]->tmp_flag = 0; + trees[i]->d_tmp_flag = 0; } for (i = 0; i < j; i++) - trees[i]->tmp_flag = 0; + trees[i]->d_tmp_flag = 0; return j; } -- 2.43.0