Avoid using C99 declaration-after-statement syntax

Add a dedicated `{}` block to contain a local variable instead.

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 4e910979e0966dc078bdaf59348ba008e68a0520..c0ca435d15c7421007f6b468d2f7180f66c6d527 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -4074,8 +4074,10 @@ write_information_block(struct archive_write *a)
        memset(info.s, 0, info_size);
        opt = 0;
 #if defined(HAVE__CTIME64_S)
-       __time64_t iso9660_birth_time_tmp = (__time64_t) iso9660->birth_time; //time_t may be shorter than 64 bits
-       _ctime64_s(buf, sizeof(buf), &(iso9660_birth_time_tmp));
+       {
+               __time64_t iso9660_birth_time_tmp = (__time64_t) iso9660->birth_time; //time_t may be shorter than 64 bits
+               _ctime64_s(buf, sizeof(buf), &(iso9660_birth_time_tmp));
+       }
 #elif defined(HAVE_CTIME_R)
        ctime_r(&(iso9660->birth_time), buf);
 #else

diff --git a/libarchive/test/test_fuzz.c b/libarchive/test/test_fuzz.c
index 71bf3ffb9b4b6f69441018e5fd96f1534ddc38aa..ce7b8663faea122747108116a7c217ea7d3e97de 100644 (file)
--- a/libarchive/test/test_fuzz.c
+++ b/libarchive/test/test_fuzz.c
@@ -110,8 +110,9 @@ test_fuzz(const struct files *filesets)
                } else {
                        for (i = 0; filesets[n].names[i] != NULL; ++i)
                        {
+                               char *newraw;
                                tmp = slurpfile(&size, filesets[n].names[i]);
-                               char *newraw = realloc(rawimage, oldsize + size);
+                               newraw = realloc(rawimage, oldsize + size);
                                if (!assert(newraw != NULL))
                                {
                                        free(rawimage);