diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-06-22 20:02:10 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-06-22 20:04:25 +0200 |
| commit | 6cbc85c018187a2b28bf0607f52bc258cc273253 (patch) | |
| tree | 1081a7da4afef0236e9ef963bf43cfd2f0d02fba /lib/sqfs/deserialize_fstree.c | |
| parent | 8edee9c4967ed9f3ce53cdc752cd2c02ca585bfe (diff) | |
Cleanup: split fstree sort into 2 fstree independend functions
Make tree node list sort and recursive variant available and independend
of the fstree_t.
This is considered cleaner, since the fstree_t actually isn't needed for
any of this and we can just call the recusvie sort on the root instead,
and we can use the sort implementation directly for things like the
upcoming unit test.
Also this commit splits up the merge/sort implementation into a seperate
split and merge functions to make the code somewhat more readable.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/sqfs/deserialize_fstree.c')
| -rw-r--r-- | lib/sqfs/deserialize_fstree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqfs/deserialize_fstree.c b/lib/sqfs/deserialize_fstree.c index 2994007..e90e1c1 100644 --- a/lib/sqfs/deserialize_fstree.c +++ b/lib/sqfs/deserialize_fstree.c @@ -175,7 +175,7 @@ int deserialize_fstree(fstree_t *out, sqfs_super_t *super, compressor_t *cmp, if (fill_dir(ir, dr, out->root, super, &idtbl, flags)) goto fail_fs; - fstree_sort(out); + tree_node_sort_recursive(out->root); status = 0; out_id: |