You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/01/01 11:10:38 UTC
[16/19] incubator-corinthia git commit: Start to make tests.
Start to make tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/479f00f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/479f00f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/479f00f1
Branch: refs/heads/RTC_platform
Commit: 479f00f1328acef4698a1c547308219ee7106c81
Parents: a0e6aa1
Author: jani <ja...@apache.org>
Authored: Tue Dec 30 20:31:18 2014 +0100
Committer: jani <ja...@apache.org>
Committed: Tue Dec 30 20:31:18 2014 +0100
----------------------------------------------------------------------
DocFormats/core/src/lib/DFZipFile.c | 5 +----
DocFormats/platform/headers/DFPlatform.h | 3 +--
DocFormats/platform/src/Wrapper.c | 6 ++++--
external/extract_downloads.sh | 1 +
4 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/479f00f1/DocFormats/core/src/lib/DFZipFile.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFZipFile.c b/DocFormats/core/src/lib/DFZipFile.c
index 7a4ff43..8d54522 100644
--- a/DocFormats/core/src/lib/DFZipFile.c
+++ b/DocFormats/core/src/lib/DFZipFile.c
@@ -77,12 +77,9 @@ static int zipAddFile(const char *dest, DFBuffer *content, DFError **error)
if (DFextZipOpenNextFile(dest, 0) < 0)
return zipError(error,"%s: Cannot create entry in zip file",dest);
-#if 0
- if (ZIP_OK != zipWriteInFileInZip(zip,content->data,(unsigned int)content->len))
+ if (DFextZipWriteCurrentFile(content->data,(unsigned int)content->len) < 0)
return zipError(error,"%s: Error writing to entry in zip file",dest);
-
-#endif
if (DFextZipCloseFile() <0)
return zipError(error,"%s: Error closing entry in zip file",dest);
return 1;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/479f00f1/DocFormats/platform/headers/DFPlatform.h
----------------------------------------------------------------------
diff --git a/DocFormats/platform/headers/DFPlatform.h b/DocFormats/platform/headers/DFPlatform.h
index 7a3d508..81d8a74 100755
--- a/DocFormats/platform/headers/DFPlatform.h
+++ b/DocFormats/platform/headers/DFPlatform.h
@@ -41,7 +41,6 @@ int DFextZipClose(void);
int DFextZipOpenNextFile(char *entryName, const int maxName);
int DFextZipCloseFile(void);
-
-
int DFextZipReadCurrentFile(char *buf, const int maxLen);
+int DFextZipWriteCurrentFile(char *buf, const int len);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/479f00f1/DocFormats/platform/src/Wrapper.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Wrapper.c b/DocFormats/platform/src/Wrapper.c
index b9df21a..f138cbe 100644
--- a/DocFormats/platform/src/Wrapper.c
+++ b/DocFormats/platform/src/Wrapper.c
@@ -129,5 +129,7 @@ int DFextZipReadCurrentFile(char *buf, const int maxLen)
-
-
+int DFextZipWriteCurrentFile(char *buf, const int len)
+{
+ return (zipWriteInFileInZip(myZipFile, buf, len) == ZIP_OK) ? 1 : -1;
+}
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/479f00f1/external/extract_downloads.sh
----------------------------------------------------------------------
diff --git a/external/extract_downloads.sh b/external/extract_downloads.sh
index 0d151e3..38b9d6e 100755
--- a/external/extract_downloads.sh
+++ b/external/extract_downloads.sh
@@ -41,5 +41,6 @@ mv packages/libxml2/libxml2-2.7.8.win32/bin/* bin
mv packages/zlib/include/* include
mv packages/zlib/lib/* lib
+mv packages/zlib/*.dll bin
rm -rf packages