Move variable definitions to the start of their respective blocks.
Improves support for older compilers.
From Boaz Stolk <bstolk@aweta.nl>.
diff --git a/regress/fread.c b/regress/fread.c
index 22b3ae4..cf7cebd 100644
--- a/regress/fread.c
+++ b/regress/fread.c
@@ -177,6 +177,7 @@
zip_file_t *zf;
enum when when_got;
zip_error_t error_got, error_ex;
+ zip_error_t *zf_error;
int err;
char b[8192];
zip_int64_t n;
@@ -188,7 +189,7 @@
if ((zf=zip_fopen(z, name, flags)) == NULL) {
when_got = WHEN_OPEN;
- zip_error_t *zf_error = zip_get_error(z);
+ zf_error = zip_get_error(z);
zip_error_set(&error_got, zip_error_code_zip(zf_error), zip_error_code_system(zf_error));
}
else {
@@ -196,7 +197,7 @@
;
if (n < 0) {
when_got = WHEN_READ;
- zip_error_t *zf_error = zip_file_get_error(zf);
+ zf_error = zip_file_get_error(zf);
zip_error_set(&error_got, zip_error_code_zip(zf_error), zip_error_code_system(zf_error));
}
err = zip_fclose(zf);
diff --git a/regress/modify.c b/regress/modify.c
index 4b9d376..916bdc7 100644
--- a/regress/modify.c
+++ b/regress/modify.c
@@ -133,13 +133,14 @@
static int
add_from_zip(int argc, char *argv[]) {
- zip_uint64_t idx;
+ zip_uint64_t idx, start;
+ zip_int64_t len;
int err;
zip_source_t *zs;
/* add from another zip file */
idx = strtoull(argv[2], NULL, 10);
- zip_uint64_t start = strtoull(argv[3], NULL, 10);
- zip_int64_t len = strtoll(argv[4], NULL, 10);
+ start = strtoull(argv[3], NULL, 10);
+ len = strtoll(argv[4], NULL, 10);
if ((z_in[z_in_count]=zip_open(argv[1], ZIP_CHECKCONS, &err)) == NULL) {
zip_error_t error;
zip_error_init_with_code(&error, err);
diff --git a/regress/source_hole.c b/regress/source_hole.c
index caf6703..eeb9582 100644
--- a/regress/source_hole.c
+++ b/regress/source_hole.c
@@ -344,6 +344,7 @@
static zip_int64_t
buffer_write(buffer_t *buffer, const zip_uint8_t *data, zip_uint64_t length, zip_error_t *error)
{
+ zip_uint8_t **fragment;
if (buffer->offset + length > buffer->nfragments * buffer->fragment_size) {
zip_uint64_t needed_fragments = (buffer->offset + length + buffer->fragment_size - 1) / buffer->fragment_size;
zip_uint64_t new_capacity = buffer->nfragments;
@@ -356,7 +357,7 @@
new_capacity *= 2;
}
- zip_uint8_t **fragment = realloc(buffer->fragment, new_capacity * sizeof(*fragment));
+ fragment = realloc(buffer->fragment, new_capacity * sizeof(*fragment));
if (fragment == NULL) {
zip_error_set(error, ZIP_ER_MEMORY, 0);
