diff options
| author |  damitha | 2010-07-07 06:59:04 +0000 |
|---|---|---|
| committer | damitha | 2010-07-07 06:59:04 +0000 |
| commit | acb8eb4a501ebed4c8df090065689d76a15552f4 (patch) | |
| tree | b64bf99cb71f2008af43ec68a255f540fd24050f /util | |
| parent | c0ecd385d8578a5a3107f10961290b5638f013a8 (diff) | |
| download | axis2c-acb8eb4a501ebed4c8df090065689d76a15552f4.tar.gz axis2c-acb8eb4a501ebed4c8df090065689d76a15552f4.tar.bz2 | |
jira AXIS2C-1472 and jira AXIS2C-1483
git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@961258 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'util')
| -rw-r--r-- | util/include/platforms/os400/axutil_os400.h | 6 | ||||
| -rw-r--r-- | util/include/platforms/unix/axutil_unix.h | 6 | ||||
| -rw-r--r-- | util/include/platforms/windows/axutil_windows.h | 5 | ||||
| -rw-r--r-- | util/src/minizip/archive_extract.c | 4 |
4 files changed, 16 insertions, 5 deletions
diff --git a/util/include/platforms/os400/axutil_os400.h b/util/include/platforms/os400/axutil_os400.h index 5261c4d..8c8f12c 100644 --- a/util/include/platforms/os400/axutil_os400.h +++ b/util/include/platforms/os400/axutil_os400.h @@ -258,7 +258,11 @@ static int os400_ftime(struct os400_timeb * tp) /** minizip functions */ #define axis2_fill_win32_filefunc(ffunc) -#define AXIS2_UNZOPEN2(zipfilename,ffunc) do { unzOpen2(zipfilename,NULL); memset(&ffunc, 0, sizeof(ffunc)); } while (0) +#define AXIS2_UNZOPEN2(zipfilename, ffunc, uf) \ + { \ + uf = unzOpen2(zipfilename,NULL); \ + memset(&ffunc, 0, sizeof(ffunc)); \ + } /** * handling variable number of arguments (for log.c) diff --git a/util/include/platforms/unix/axutil_unix.h b/util/include/platforms/unix/axutil_unix.h index 3088d0d..7a5c084 100644 --- a/util/include/platforms/unix/axutil_unix.h +++ b/util/include/platforms/unix/axutil_unix.h @@ -262,7 +262,11 @@ extern "C" /** minizip functions */ #define axis2_fill_win32_filefunc(ffunc) -#define AXIS2_UNZOPEN2(zipfilename,ffunc) unzOpen2(zipfilename,NULL); memset(&ffunc, 0, sizeof(ffunc)); +#define AXIS2_UNZOPEN2(zipfilename, ffunc, uf) \ + { \ + uf = unzOpen2(zipfilename,NULL); \ + memset(&ffunc, 0, sizeof(ffunc)); \ + } /** * handling variable number of arguments (for log.c) diff --git a/util/include/platforms/windows/axutil_windows.h b/util/include/platforms/windows/axutil_windows.h index 44a3ac9..53d332c 100644 --- a/util/include/platforms/windows/axutil_windows.h +++ b/util/include/platforms/windows/axutil_windows.h @@ -255,7 +255,10 @@ extern "C" * minizip functions */ #define axis2_fill_win32_filefunc(ffunc) fill_win32_filefunc(ffunc) -#define AXIS2_UNZOPEN2(zipfilename,ffunc) unzOpen2(zipfilename,NULL) +#define AXIS2_UNZOPEN2(zipfilename, ffunc, uf) \ + { \ + uf = unzOpen2(zipfilename,NULL); \ + } /** * handling variable number of arguments (for log.c) diff --git a/util/src/minizip/archive_extract.c b/util/src/minizip/archive_extract.c index 7a0d7fe..8041302 100644 --- a/util/src/minizip/archive_extract.c +++ b/util/src/minizip/archive_extract.c @@ -267,12 +267,12 @@ aar_extract( axis2_fill_win32_filefunc(&ffunc); ((void)(ffunc)); /* Just to avoid unused variable warning */ - uf = AXIS2_UNZOPEN2(zipfilename, ffunc); + AXIS2_UNZOPEN2(zipfilename, ffunc, uf); if (uf == NULL) { strcat(filename_try, ".zip"); - uf = AXIS2_UNZOPEN2(zipfilename, ffunc); + AXIS2_UNZOPEN2(zipfilename, ffunc, uf); } } |