corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] incubator-corinthia git commit: Added patch from Gabriela
Date Mon, 23 Feb 2015 11:23:19 GMT
Added patch from Gabriela

This updates all #endif, admitted something I shold have done in the first place


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/13f9a17e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/13f9a17e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/13f9a17e

Branch: refs/heads/master
Commit: 13f9a17e7f820d087a3aa63dece8b7b24671bfdb
Parents: dab820a
Author: jani <jani@apache.org>
Authored: Mon Feb 23 12:22:02 2015 +0100
Committer: jani <jani@apache.org>
Committed: Mon Feb 23 12:22:02 2015 +0100

----------------------------------------------------------------------
 DocFormats/headers/DFPlatform.h | 50 ++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/13f9a17e/DocFormats/headers/DFPlatform.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFPlatform.h b/DocFormats/headers/DFPlatform.h
index 87a3fda..3790545 100755
--- a/DocFormats/headers/DFPlatform.h
+++ b/DocFormats/headers/DFPlatform.h
@@ -30,12 +30,11 @@
 
 #ifndef snprintf
 #define snprintf _snprintf
-#endif
+#endif // snprintf
 
 #else
 #include <unistd.h>
-#endif
-
+#endif // WIN32
 
 #ifndef ATTRIBUTE_FORMAT
 #ifdef _MSC_VER
@@ -44,10 +43,8 @@
 #else
 #define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
 #define ATTRIBUTE_ALIGNED(n) __attribute__((aligned (n)))
-#endif
-#endif
-
-
+#endif // _MSC_VER
+#endif // ATTRIBUTE_FORMAT
 
 typedef struct DFDirEntryList DFDirEntryList;
 
@@ -57,13 +54,19 @@ struct DFDirEntryList {
 };
 
 int DFMkdirIfAbsent(const char *path, char **errmsg);
-int DFAddDirContents(const char *absPath, const char *relPath, int recursive, DFDirEntryList
***list, char **errmsg);
-int DFGetImageDimensions(const void *data, size_t len, const char *ext,
-                         unsigned int *width, unsigned int *height, char **errmsg);
+
+int DFAddDirContents(const char *absPath, const char *relPath, 
+                     int recursive, DFDirEntryList ***list, 
+                     char **errmsg);
+
+int DFGetImageDimensions(const void *data, size_t len, 
+                         const char *ext, unsigned int *width, 
+                         unsigned int *height, char **errmsg);
 
 #define DF_ONCE_INIT 0
 typedef int DFOnce;
 typedef void (*DFOnceFunction)(void);
+
 void DFInitOnce(DFOnce *once, DFOnceFunction fun);
 
 // Zip functions
@@ -72,15 +75,28 @@ typedef struct {
         int   zipFlag;
         int   zipFirst;
         } DFextZipHandle;
+
 typedef DFextZipHandle * DFextZipHandleP;
 
 DFextZipHandleP DFextZipOpen(const char *zipFilename, int doUnzip);
-int             DFextZipClose(DFextZipHandleP zipHandle);
 
-int             DFextZipOpenNextFile(DFextZipHandleP zipHandle, char *entryName, const int
maxName);
-int             DFextZipAppendNewFile(DFextZipHandleP zipHandle, const char *entryName);
-int             DFextZipCloseFile(DFextZipHandleP zipHandle);
+int DFextZipClose(DFextZipHandleP zipHandle);
+
+int DFextZipOpenNextFile(DFextZipHandleP zipHandle,
+                         char *entryName,
+                         const int maxName);
+
+int DFextZipAppendNewFile(DFextZipHandleP zipHandle,
+                          const char *entryName);
+
+int DFextZipCloseFile(DFextZipHandleP zipHandle);
+
+int DFextZipReadCurrentFile(DFextZipHandleP zipHandle,
+                            void *buf,
+                            const int maxLen);
+
+int DFextZipWriteCurrentFile(DFextZipHandleP zipHandle,
+                             const void *buf,
+                             const int len);
 
-int DFextZipReadCurrentFile(DFextZipHandleP zipHandle, void *buf, const int maxLen);
-int DFextZipWriteCurrentFile(DFextZipHandleP zipHandle, const void *buf, const int len);
-#endif
+#endif // DocFormats_DFPlatform_h


Mime
View raw message