73 lines
3.1 KiB
Diff
73 lines
3.1 KiB
Diff
From 37efd285ba34f53451d11ad2390604e1d46536b0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
|
Date: Wed, 17 May 2023 09:34:05 +0200
|
|
Subject: [PATCH 3/4] Fix: error: a label can only be part of a statement
|
|
|
|
Declaration is not a statement.
|
|
This seems to work with newer versions of GCC but the C language
|
|
standard only allows statements to follow a label.
|
|
---
|
|
src/compression_wrapper.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c
|
|
index 9100222..af06543 100644
|
|
--- a/src/compression_wrapper.c
|
|
+++ b/src/compression_wrapper.c
|
|
@@ -845,7 +845,7 @@ cr_close(CR_FILE *cr_file, GError **err)
|
|
}
|
|
break;
|
|
|
|
- case (CR_CW_ZSTD_COMPRESSION): // --------------------------------------
|
|
+ case (CR_CW_ZSTD_COMPRESSION): { // --------------------------------------
|
|
#ifdef WITH_ZSTD
|
|
ZstdFile * zstd = (ZstdFile *) cr_file->FILE;
|
|
if (cr_file->mode == CR_CW_MODE_READ) {
|
|
@@ -881,7 +881,7 @@ cr_close(CR_FILE *cr_file, GError **err)
|
|
g_set_error(err, ERR_DOMAIN, CRE_IO, "createrepo_c wasn't compiled with zstd support");
|
|
break;
|
|
#endif // WITH_ZSTD
|
|
-
|
|
+ }
|
|
case (CR_CW_BZ2_COMPRESSION): // --------------------------------------
|
|
if (cr_file->mode == CR_CW_MODE_READ)
|
|
BZ2_bzReadClose(&rc, (BZFILE *) cr_file->FILE);
|
|
@@ -1093,7 +1093,7 @@ cr_read(CR_FILE *cr_file, void *buffer, unsigned int len, GError **err)
|
|
}
|
|
break;
|
|
|
|
- case (CR_CW_ZSTD_COMPRESSION): // ---------------------------------------
|
|
+ case (CR_CW_ZSTD_COMPRESSION): { // ---------------------------------------
|
|
#ifdef WITH_ZSTD
|
|
ZstdFile * zstd = (ZstdFile *) cr_file->FILE;
|
|
|
|
@@ -1129,7 +1129,7 @@ cr_read(CR_FILE *cr_file, void *buffer, unsigned int len, GError **err)
|
|
g_set_error(err, ERR_DOMAIN, CRE_IO, "createrepo_c wasn't compiled with zstd support");
|
|
break;
|
|
#endif // WITH_ZSTD
|
|
-
|
|
+ }
|
|
case (CR_CW_BZ2_COMPRESSION): // --------------------------------------
|
|
ret = BZ2_bzRead(&bzerror, (BZFILE *) cr_file->FILE, buffer, len);
|
|
if (!ret && bzerror == BZ_SEQUENCE_ERROR)
|
|
@@ -1364,7 +1364,7 @@ cr_write(CR_FILE *cr_file, const void *buffer, unsigned int len, GError **err)
|
|
}
|
|
break;
|
|
|
|
- case (CR_CW_ZSTD_COMPRESSION): // ---------------------------------------
|
|
+ case (CR_CW_ZSTD_COMPRESSION): { // ---------------------------------------
|
|
#ifdef WITH_ZSTD
|
|
ZstdFile * zstd = (ZstdFile *) cr_file->FILE;
|
|
ZSTD_inBuffer zib = {buffer, len, 0};
|
|
@@ -1401,6 +1401,7 @@ cr_write(CR_FILE *cr_file, const void *buffer, unsigned int len, GError **err)
|
|
g_set_error(err, ERR_DOMAIN, CRE_IO, "createrepo_c wasn't compiled with zstd support");
|
|
break;
|
|
#endif // WITH_ZSTD
|
|
+ }
|
|
|
|
case (CR_CW_BZ2_COMPRESSION): // --------------------------------------
|
|
BZ2_bzWrite(&bzerror, (BZFILE *) cr_file->FILE, (void *) buffer, len);
|
|
--
|
|
2.48.1
|
|
|