diff options
| -rw-r--r-- | ext/zip/lib/zip_source_win32a.c | 10 | ||||
| -rw-r--r-- | ext/zip/lib/zip_source_win32handle.c | 3 | ||||
| -rw-r--r-- | ext/zip/lib/zip_source_win32w.c | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/ext/zip/lib/zip_source_win32a.c b/ext/zip/lib/zip_source_win32a.c index c20e891b08..e9786c473e 100644 --- a/ext/zip/lib/zip_source_win32a.c +++ b/ext/zip/lib/zip_source_win32a.c @@ -45,11 +45,11 @@ static int _win32_rename_temp_a(_zip_source_win32_read_file_t *ctx); static int _win32_remove_a(const void *fname); static _zip_source_win32_file_ops_t win32_ops_a = { - .op_strdup = _win32_strdup_a, - .op_open = _win32_open_a, - .op_create_temp = _win32_create_temp_a, - .op_rename_temp = _win32_rename_temp_a, - .op_remove = _win32_remove_a + _win32_strdup_a, + _win32_open_a, + _win32_create_temp_a, + _win32_rename_temp_a, + _win32_remove_a }; ZIP_EXTERN zip_source_t * diff --git a/ext/zip/lib/zip_source_win32handle.c b/ext/zip/lib/zip_source_win32handle.c index dd17c021b3..d195a119db 100644 --- a/ext/zip/lib/zip_source_win32handle.c +++ b/ext/zip/lib/zip_source_win32handle.c @@ -423,6 +423,7 @@ _win32_create_temp_file(_zip_source_win32_read_file_t *ctx) PSECURITY_ATTRIBUTES psa = NULL; DWORD len; BOOL success; + zip_uint32_t value; /* Read the DACL from the original file, so we can copy it to the temp file. @@ -448,7 +449,7 @@ _win32_create_temp_file(_zip_source_win32_read_file_t *ctx) } } - zip_uint32_t value = GetTickCount(); + value = GetTickCount(); for (i = 0; i < 1024 && th == INVALID_HANDLE_VALUE; i++) { th = ctx->ops->op_create_temp(ctx, &temp, value + i, psa); if (th == INVALID_HANDLE_VALUE && GetLastError() != ERROR_FILE_EXISTS) diff --git a/ext/zip/lib/zip_source_win32w.c b/ext/zip/lib/zip_source_win32w.c index 27cdf910e0..34134561f1 100644 --- a/ext/zip/lib/zip_source_win32w.c +++ b/ext/zip/lib/zip_source_win32w.c @@ -45,11 +45,11 @@ static int _win32_rename_temp_w(_zip_source_win32_read_file_t *ctx); static int _win32_remove_w(const void *fname); static _zip_source_win32_file_ops_t win32_ops_w = { - .op_strdup = _win32_strdup_w, - .op_open = _win32_open_w, - .op_create_temp = _win32_create_temp_w, - .op_rename_temp = _win32_rename_temp_w, - .op_remove = _win32_remove_w + _win32_strdup_w, + _win32_open_w, + _win32_create_temp_w, + _win32_rename_temp_w, + _win32_remove_w }; ZIP_EXTERN zip_source_t * |