[Squashfs-devel] [PATCH] mksquashfs: fix compilation on older toolchains

[Thomas De S. <pat...@gm...>]

From: Thomas De Schampheleire <tho...@gm...>

Compiling mksquashfs on RHEL 5 (gcc 4.1.2, glibc 2.5) gives the following
error:

    mksquashfs.c: In function ‘get_fragment’:
    mksquashfs.c:1440: error: label at end of compound statement

On RHEL 6 (gcc 4.4.7, glibc 2.12), the preprocessed output shows a difference
for pthread_cleanup_pop, which now has a dummy do {} while (0); statement,
presumably to fix this exact error.

Fix for RHEL 5 by manually inserting that dummy statement.

Signed-off-by: Thomas De Schampheleire <tho...@gm...>
---
 squashfs-tools/mksquashfs.c        | 1 +
 squashfs-tools/process_fragments.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index d221c35..13d60f7 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -1411,6 +1411,7 @@ again:
 	cache_block_put(compressed_buffer);
 
 finished:
+	do { } while (0);
 	pthread_cleanup_pop(0);
 
 	return buffer;
diff --git a/squashfs-tools/process_fragments.c b/squashfs-tools/process_fragments.c
index bba6f5a..971dc11 100644
--- a/squashfs-tools/process_fragments.c
+++ b/squashfs-tools/process_fragments.c
@@ -210,6 +210,7 @@ again:
 	cache_block_put(compressed_buffer);
 
 finished:
+	do { } while (0);
 	pthread_cleanup_pop(0);
 
 	return buffer;
-- 
1.9.5