Changeset 68 in libcf

Timestamp:

04/11/13 13:25:37 (11 years ago)

Author:

cheese

Message:

#1 fix hex codec bug and add codec to windows project

Location:

trunk

Files:

• src/cf_codec.c (modified) (1 diff)
• test/codec.c (modified) (2 diffs)
• test/test.c (modified) (4 diffs)
• windows/libcf/libcf.vcproj (modified) (2 diffs)

trunk/src/cf_codec.c

@@ -51 +51 @@
         hex[iter + 1] = hexchar[((*(ptr))     ) & 0x0f];
     }
-    hex[count] = '\0';
+    hex[count - 1] = '\0';
 
     return CF_OK;

trunk/test/codec.c

@@ -10 +10 @@
 int main (void)
 {
-    char data[] =
-        "【 曲名 : 사랑하고 있는데 】\n"
-        "《 歌 : Kylee 》\n"
-        "『 절원의 템페스트 OP2 Theme 』\n";
+    char data[] = "ONE OK ROCK - Nothing Helps";
 
     char hex[512] = {0x00,};
@@ -19 +16 @@
     size_t length = 0;
 
+    CF_DEBUG_PRINT (stderr, " = Convert binary to hex = \n");
     CF_Codec_BinaryToHex ((unsigned char *)data, strlen (data), hex);
-    CF_DEBUG_PRINT (stdout, "data : \n%s\n", data);
-    CF_DEBUG_PRINT (stdout, "hex : \n%s\n\n", hex);
-    CF_DEBUG_PRINT_BIN (stdout, (unsigned char *) data, strlen (data), "data : \n%s", data);
+    CF_DEBUG_PRINT (stderr, "data : %s\n", data);
+    CF_DEBUG_PRINT (stderr, "hex : %s\n", hex);
+    CF_DEBUG_PRINT_BIN (stdout, (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_DEBUG_PRINT (stdout, "bin : \n%s\n", bin);
-    CF_DEBUG_PRINT_BIN (stdout, bin, length, "bin : \n%s\n", bin);
+    CF_DEBUG_PRINT (stderr, "bin : %s\n", bin);
+    CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin : %s\n", bin);
 
     return 0;

trunk/test/test.c

@@ -7 +7 @@
 #include "cf_socket.h"
 #include "cf_thread.h"
+#include "cf_codec.h"
 
 /*
@@ -37 +38 @@
 int     socket_echo_client  (void * arg);
 void    test_socket         (void);
+void    test_codec          (void);
 
 int main (int argc, char ** argv)
@@ -59 +61 @@
     CF_DEBUG_PRINT (stderr, " == MULTI-THREADED SOCKET TEST ==\n");
     test_socket ();
+
+    // 5
+    CF_DEBUG_PRINT (stderr, " == CODEC TEST ==\n");
+    test_codec ();
 
     CF_DEBUG_PRINT (stderr, " == END OF TEST ==\n");
@@ -373 +379 @@
 }
 
+void test_codec (void)
+{
+    char data[] = "ONE OK ROCK - Nothing Helps";
+
+    char hex[512] = {0x00,};
+    unsigned char bin[512] = {0x00,};
+    size_t length = 0;
+
+    CF_DEBUG_PRINT (stderr, " = Convert binary to hex = \n");
+    CF_Codec_BinaryToHex ((unsigned char *)data, strlen (data), hex);
+    CF_DEBUG_PRINT (stderr, "data : %s\n", data);
+    CF_DEBUG_PRINT (stderr, "hex : %s\n", hex);
+    CF_DEBUG_PRINT_BIN (stdout, (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_DEBUG_PRINT (stderr, "bin : %s\n", bin);
+    CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin : %s\n", bin);
+}

trunk/windows/libcf/libcf.vcproj

@@ -176 +176 @@
             >
             <File
+                RelativePath="..\..\src\cf_codec.c"
+                >
+            </File>
+            <File
                 RelativePath="..\..\src\cf_debug.c"
                 >
@@ -210 +214 @@
             </File>
             <File
+                RelativePath="..\..\include\cf_codec.h"
+                >
+            </File>
+            <File
                 RelativePath="..\..\include\cf_debug.h"
                 >