Changeset 55 in libcf for trunk/src/cf_file.c

Timestamp:

04/06/13 21:44:24 (11 years ago)

Author:

cheese

Message:

#1 arrange definition and fix for windows

File:

• trunk/src/cf_file.c (modified) (9 diffs)

trunk/src/cf_file.c

@@ -13 +13 @@
 #if defined(_WIN32) || defined(_WIN64)
 # include <io.h>
+# include <direct.h>
 
 # define DELIMITER      '\\'
 # define mkdir(a,b)     _mkdir (a)
 # define access(a,b)    _access (a,b)
+# define snprintf       _snprintf
 
 # define F_OK           0
@@ -46 +48 @@
 #define FILE_MODE       S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH
 
+#define ASSERT_ARGS(x)                  \
+    if ((x))                            \
+        return CF_ERROR_FILE_INVALID_ARGS
+
 /**
  * 파일 열기
@@ -60 +66 @@
               const CF_FILE_FLAG    flag)
 {
-    int result = open (path, (int)(flag|O_BINARY));
+    int result = 0;
+
+    ASSERT_ARGS (path == NULL);
+
+    result = open (path, (int)(flag|O_BINARY));
 
     if (result < 0)
@@ -78 +88 @@
 CF_File_Create (const char * path)
 {
-    int result = open (path, CF_FILE_CR|CF_FILE_WO|CF_FILE_TR, FILE_MODE);
+    int result = 0;
+    
+    ASSERT_ARGS (path == NULL);
+
+    result = open (path, CF_FILE_CR|CF_FILE_WO|CF_FILE_TR, FILE_MODE);
 
     if (result < 0)
@@ -98 +112 @@
     int result = 0;
 
-    if (fd < 0)
-        return CF_ERROR_FILE_INVALID_ARGS;
+    ASSERT_ARGS (fd < 0);
 
     result = close (fd);
@@ -123 +136 @@
               const size_t  len)
 {
-    int result = (int) read (fd, buf, len);
+    int result = 0;
+    
+    ASSERT_ARGS (fd < 0);
+    ASSERT_ARGS (buf == NULL);
+
+    result = (int) read (fd, buf, len);
 
     if (result < 0)
@@ -145 +163 @@
                const size_t len)
 {
-    int result = (int) write (fd, buf, len);
+    int result = 0;
+    
+    ASSERT_ARGS (fd < 0);
+    ASSERT_ARGS (buf == NULL);
+
+    (int) write (fd, buf, len);
 
     if (result != len)
@@ -163 +186 @@
 CF_File_GetSize (const int fd)
 {
-    int result = (int) lseek (fd, 0, SEEK_END);
+    int result = 0;
+
+    ASSERT_ARGS (fd < 0);
+
+    (int) lseek (fd, 0, SEEK_END);
 
     if (result < 0 || lseek (fd, 0, SEEK_SET) < 0)
@@ -187 +214 @@
     char    * f = fullPath;
     char    * d = stepPath;
+
+    ASSERT_ARGS (path == NULL);
 
     snprintf (fullPath, sizeof (fullPath) - 1, "%s%c", path, DELIMITER);