Changeset 72 in libcf

Timestamp:

04/15/13 10:02:52 (11 years ago)

Author:

cheese

Message:

#1 modify test code and data-type in codec

Location:

trunk

Files:

• src/cf_codec.c (modified) (3 diffs)
• test/codec.c (modified) (1 diff)
• test/test.c (modified) (7 diffs)

trunk/src/cf_codec.c

@@ -17 +17 @@
 #define IS_UPPERCASE(x)     (x >= 'A' && x <= 'F')
 
+typedef unsigned char __uchar;
+
 /**
  * 바이너리 데이터를 16진수 문자열로 변환
@@ -33 +35 @@
                       char                  * hex)
 {
-    size_t  iter = 0;
-    size_t  count = len * 2 + 1;
+    size_t      iter = 0;
+    size_t      count = len * 2 + 1;
 
-    char    hexchar[] = {'0', '1', '2', '3',
-                         '4', '5', '6', '7',
-                         '8', '9', 'a', 'b',
-                         'c', 'd', 'e', 'f'};
+    const char  hexchar[] = {'0', '1', '2', '3',
+                             '4', '5', '6', '7',
+                             '8', '9', 'a', 'b',
+                             'c', 'd', 'e', 'f'};
 
-    const unsigned char * ptr = bin;
+    const __uchar   * ptr = bin;
 
     ASSERT_ARGS (bin == NULL);
@@ -72 +74 @@
                       size_t        * len)
 {
-    typedef unsigned char __uchar;
-
     int     result = 0;
 

trunk/test/codec.c

@@ -16 +16 @@
     size_t length = 0;
 
-    CF_DEBUG_PRINT (stderr, " = Convert binary to hex = \n");
+    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_DEBUG_PRINT (stderr, "data : %s\n", data);
-    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, "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_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);
+    CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin    : %s\n", bin);
 
     return 0;

trunk/test/test.c

@@ -238 +238 @@
     CF_Log_Write (LOG_SOCKET, "SERVER", "accepted\n");
 
-    for (i = 0 ; i < 100 ; i++)
+    for (i = 0 ; i < 10 ; i++)
     {
         if ((recvd = CF_Socket_Recv (clntsock, buf, sizeof (buf))) < 0)
@@ -246 +246 @@
         }
         CF_Log_Write (LOG_SOCKET, "SERVER", "recv {%s}\n", buf);
+        CF_DEBUG_PRINT (stderr, "[SERVER] recv {%s}\n", buf);
 
         if (CF_Socket_Send (clntsock, buf, recvd) < 0)
@@ -252 +253 @@
         }
         CF_Log_Write (LOG_SOCKET, "SERVER", "resp {%s}\n", buf);
+        CF_DEBUG_PRINT (stderr, "[SERVER] resp {%s}\n", buf);
     }
 
@@ -278 +280 @@
     CF_Log_Write (LOG_SOCKET, "CLIENT", "connected\n");
 
-    for (i = 0 ; i < 100 ; i++)
+    for (i = 0 ; i < 10 ; i++)
     {
         if (CF_Socket_Send (sock, buf, sizeof (buf)) < 0)
@@ -286 +288 @@
         }
         CF_Log_Write (LOG_SOCKET, "CLIENT", "sent {%s}\n", buf);
+        CF_DEBUG_PRINT (stderr, "[CLIENT] sent {%s}\n", buf);
 
         memset (buf, 0x00, sizeof (buf));
@@ -295 +298 @@
         }
         CF_Log_Write (LOG_SOCKET, "CLIENT", "recv {%s}\n", buf);
+        CF_DEBUG_PRINT (stderr, "[CLIENT] recv {%s}\n", buf);
     }
 
@@ -387 +391 @@
     size_t length = 0;
 
-    CF_DEBUG_PRINT (stderr, " = Convert binary to hex = \n");
+    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_DEBUG_PRINT (stderr, "data : %s\n", data);
-    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_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_DEBUG_PRINT (stderr, "bin : %s\n", bin);
-    CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin : %s\n", bin);
-}
+    CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin    : %s\n", bin);
+}