From d5d4143dd3412e763562bcbc37cb501d0ad67603 Mon Sep 17 00:00:00 2001 From: renxudong Date: Sun, 11 Aug 2019 01:13:34 -0400 Subject: [PATCH 5/8] unsquashfs-no-longer-need-to-version-and-export-some --- squashfs-tools/unsquash-2.c | 4 ++-- squashfs-tools/unsquash-3.c | 4 ++-- squashfs-tools/unsquash-4.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/squashfs-tools/unsquash-2.c b/squashfs-tools/unsquash-2.c index 9b4ade4..4f2769a 100644 --- a/squashfs-tools/unsquash-2.c +++ b/squashfs-tools/unsquash-2.c @@ -40,7 +40,7 @@ void read_block_list_2(unsigned int *block_list, char *block_ptr, int blocks) } -int read_fragment_table_2(long long *directory_table_end) +static int read_fragment_table(long long *directory_table_end) { int res, i; int bytes = SQUASHFS_FRAGMENT_BYTES_2(sBlk.s.fragments); @@ -277,7 +277,7 @@ int read_filesystem_tables_2() if(read_uids_guids_1() == FALSE) return FALSE; - if(read_fragment_table_2(&directory_table_end) == FALSE) + if(read_fragment_table(&directory_table_end) == FALSE) return FALSE; if(read_inode_table(sBlk.s.inode_table_start, diff --git a/squashfs-tools/unsquash-3.c b/squashfs-tools/unsquash-3.c index 622ce1e..4768270 100644 --- a/squashfs-tools/unsquash-3.c +++ b/squashfs-tools/unsquash-3.c @@ -27,7 +27,7 @@ static squashfs_fragment_entry_3 *fragment_table; -int read_fragment_table_3(long long *directory_table_end) +static int read_fragment_table(long long *directory_table_end) { int res, i; int bytes = SQUASHFS_FRAGMENT_BYTES_3(sBlk.s.fragments); @@ -404,7 +404,7 @@ int read_filesystem_tables_3() if(read_uids_guids_1() == FALSE) return FALSE; - if(read_fragment_table_3(&directory_table_end) == FALSE) + if(read_fragment_table(&directory_table_end) == FALSE) return FALSE; if(read_inode_table(sBlk.s.inode_table_start, diff --git a/squashfs-tools/unsquash-4.c b/squashfs-tools/unsquash-4.c index 0f51888..c335d7c 100644 --- a/squashfs-tools/unsquash-4.c +++ b/squashfs-tools/unsquash-4.c @@ -29,7 +29,7 @@ static struct squashfs_fragment_entry *fragment_table; static unsigned int *id_table; -int read_fragment_table_4(long long *directory_table_end) +static int read_fragment_table(long long *directory_table_end) { int res, i; size_t bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); @@ -361,7 +361,7 @@ corrupted: } -int read_uids_guids_4() +static int read_uids_guids() { int res, i; int bytes = SQUASHFS_ID_BYTES(sBlk.s.no_ids); @@ -406,10 +406,10 @@ int read_filesystem_tables_4() { long long directory_table_end; - if(read_uids_guids_4() == FALSE) + if(read_uids_guids() == FALSE) return FALSE; - if(read_fragment_table_4(&directory_table_end) == FALSE) + if(read_fragment_table(&directory_table_end) == FALSE) return FALSE; if(read_inode_table(sBlk.s.inode_table_start, -- 1.8.3.1