diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-07-08 21:55:56 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-07-08 21:55:56 -0400 |
| commit | a54a032daaf935da3006902c7fbc7064026cd158 (patch) | |
| tree | 32f87b6a23b9572fd97a7c3cc9d2cd1bd836abfd | |
| parent | 0b5cd06a3d5e24abe0264068638334ebb2ada587 (diff) | |
Use the file string pool when merging directories.
| -rw-r--r-- | librazor/merger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/librazor/merger.c b/librazor/merger.c index 636903a..1d1615e 100644 --- a/librazor/merger.c +++ b/librazor/merger.c @@ -261,8 +261,8 @@ merge_one_directory(struct razor_merger *merger, struct merge_directory *md) set2 = merger->source2.set; map1 = merger->source1.file_map; map2 = merger->source2.file_map; - pool1 = set1->string_pool.data; - pool2 = set2->string_pool.data; + pool1 = set1->file_string_pool.data; + pool2 = set2->file_string_pool.data; root1 = (struct razor_entry *) set1->files.data; root2 = (struct razor_entry *) set2->files.data; |