Changeset 86 in libcf

Timestamp:

05/07/13 17:05:24 (11 years ago)

Author:

cheese

Message:

#1 fix datetime in log for win64 and rename some enumerations and functions

Location:

trunk

Files:

• include/cf_codec.h (modified) (1 diff)
• include/cf_file.h (modified) (1 diff)
• src/cf_codec.c (modified) (2 diffs)
• src/cf_file.c (modified) (1 diff)
• src/cf_log.c (modified) (1 diff)
• test/codec.c (modified) (1 diff)
• test/file.c (modified) (1 diff)
• test/test.c (modified) (2 diffs)

trunk/include/cf_codec.h

@@ -19 +19 @@
 
 CF_EXPORT int
-CF_Codec_BinaryToHex        (const unsigned char    * bin,
-                             const size_t           len,
-                             char                   * hex);
+CF_Codec_Hex_Encode     (const unsigned char    * bin,
+                         const size_t           len,
+                         char                   * hex);
 
 CF_EXPORT int
-CF_Codec_HexToBinary        (const char     * hex,
-                             unsigned char  * bin,
-                             size_t         * len);
+CF_Codec_Hex_Decode     (const char     * hex,
+                         unsigned char  * bin,
+                         size_t         * len);
 
 #ifdef __cplusplus

trunk/include/cf_file.h

@@ -15 +15 @@
 /** 파일 열기 옵션 플래그 */
 typedef enum {
-    CF_FILE_RO = O_RDONLY,  /**< 읽기 전용 */
-    CF_FILE_WO = O_WRONLY,  /**< 쓰기 전용 */
-    CF_FILE_WR = O_RDWR,    /**< 읽기/쓰기 */
-    CF_FILE_CR = O_CREAT,   /**< 파일이 존재하지 않으면 생성 */
-    CF_FILE_TR = O_TRUNC,   /**< 파일이 존재하면 비우기 */
-    CF_FILE_AP = O_APPEND   /**< 파일이 존재하면 이어서 쓰기 */
+    CF_FILE_READ    = O_RDONLY, /**< 읽기 전용 */
+    CF_FILE_WRITE   = O_WRONLY, /**< 쓰기 전용 */
+    CF_FILE_RW      = O_RDWR,   /**< 읽기/쓰기 */
+    CF_FILE_CREATE  = O_CREAT,  /**< 파일이 존재하지 않으면 생성 */
+    CF_FILE_TRUNC   = O_TRUNC,  /**< 파일이 존재하면 비우기 */
+    CF_FILE_APPEND  = O_APPEND  /**< 파일이 존재하면 이어서 쓰기 */
 } E_CF_FILE_FLAG, CF_FILE_FLAG;
 

trunk/src/cf_codec.c

@@ -33 +33 @@
  */
 int
-CF_Codec_BinaryToHex (const unsigned char   * bin,
-                      const size_t          len,
-                      char                  * hex)
+CF_Codec_Hex_Encode (const unsigned char    * bin,
+                     const size_t           len,
+                     char                   * hex)
 {
     size_t      iter = 0;
@@ -74 +74 @@
  */
 int
-CF_Codec_HexToBinary (const char    * hex,
-                      unsigned char * bin,
-                      size_t        * len)
+CF_Codec_Hex_Decode (const char     * hex,
+                     unsigned char  * bin,
+                     size_t         * len)
 {
     int     result = 0;

trunk/src/cf_file.c

@@ -91 +91 @@
     ASSERT_ARGS (path == NULL);
 
-    result = open (path, CF_FILE_CR|CF_FILE_WO|CF_FILE_TR, FILE_MODE);
+    result = open (path, CF_FILE_CREATE|CF_FILE_WRITE|CF_FILE_TRUNC, FILE_MODE);
 
     if (result < 0)

trunk/src/cf_log.c

@@ -5 +5 @@
 #if defined(_WIN32) || defined(_WIN64)
 # define _USE_32BIT_TIME_T
+# if (_MSC_VER >= 1400)
+#  define localtime     _localtime32
+# endif
 #endif
 

trunk/test/codec.c

@@ -18 +18 @@
     CF_DEBUG_PRINT (stderr, "data   : %s\n", data);
     CF_DEBUG_PRINT (stderr, "= Convert binary to hex =\n");
-    CF_Codec_BinaryToHex ((unsigned char *)data, strlen (data), hex);
+    CF_Codec_Hex_Encode ((unsigned char *)data, strlen (data), hex);
     CF_DEBUG_PRINT (stderr, "hex    : %s\n", hex);
     CF_DEBUG_PRINT_BIN (stderr, (unsigned char *) data, strlen (data), "data   : %s\n", data);
 
     CF_DEBUG_PRINT (stderr, "= Convert hex to binary =\n");
-    CF_Codec_HexToBinary (hex, bin, &length);
+    CF_Codec_Hex_Decode (hex, bin, &length);
     CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin    : %s\n", bin);
 

trunk/test/file.c

@@ -30 +30 @@
     CF_File_Close (fd);
 
-    fd = CF_File_Open (name, CF_FILE_RO);
+    fd = CF_File_Open (name, CF_FILE_READ);
     if (fd < 0) {
         // error

trunk/test/test.c

@@ -174 +174 @@
     char    buffer[128] = {0x00,};
 
-    fd = CF_File_Open (file, CF_FILE_RO);
+    fd = CF_File_Open (file, CF_FILE_READ);
     if (fd < 0)
         CF_DEBUG_PRINT (stderr, "what the ... file open ?\n");
@@ -393 +393 @@
     CF_DEBUG_PRINT (stderr, "data   : %s\n", data);
     CF_DEBUG_PRINT (stderr, "= Convert binary to hex =\n");
-    CF_Codec_BinaryToHex ((unsigned char *)data, strlen (data), hex);
+    CF_Codec_Hex_Encode ((unsigned char *)data, strlen (data), hex);
     CF_DEBUG_PRINT (stderr, "hex    : %s\n", hex);
     CF_DEBUG_PRINT_BIN (stderr, (unsigned char *) data, strlen (data), "data   : %s\n", data);
 
     CF_DEBUG_PRINT (stderr, "= Convert hex to binary =\n");
-    CF_Codec_HexToBinary (hex, bin, &length);
+    CF_Codec_Hex_Decode (hex, bin, &length);
     CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin    : %s\n", bin);
 }