Changeset 1266 for pjproject/trunk/pjsip/src/test-pjsip/msg_test.c

Timestamp:

May 11, 2007 3:14:34 PM (17 years ago)

Author:

bennylp

Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:

• pjproject/trunk/pjsip/src/test-pjsip/msg_test.c (modified) (8 diffs)

pjproject/trunk/pjsip/src/test-pjsip/msg_test.c

@@ -187 +187 @@
 
     /* Create buffer for comparison. */
-    str1.ptr = pj_pool_alloc(pool, BUFLEN);
-    str2.ptr = pj_pool_alloc(pool, BUFLEN);
+    str1.ptr = (char*)pj_pool_alloc(pool, BUFLEN);
+    str2.ptr = (char*)pj_pool_alloc(pool, BUFLEN);
 
     /* Compare message type. */
@@ -661 +661 @@
 
     // Body
-    body = pj_pool_zalloc(pool, sizeof(*body));
+    body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body);
     msg->body = body;
     body->content_type.type = pj_str("application");
     body->content_type.subtype = pj_str("sdp");
-    body->data = 
+    body->data = (void*)
         "v=0\r\n"
         "o=alice 53655765 2353687637 IN IP4 pc33.atlanta.com\r\n"
@@ -673 +673 @@
         "m=audio 3456 RTP/AVP 0 1 3 99\r\n"
         "a=rtpmap:0 PCMU/8000\r\n";
-    body->len = pj_native_strlen(body->data);
+    body->len = pj_native_strlen((const char*) body->data);
     body->print_body = &pjsip_print_text_body;
 
@@ -716 +716 @@
 
     for (loop=0; loop<LOOP; ++loop) {
-        for (i=0; i<PJ_ARRAY_SIZE(test_array); ++i) {
+        for (i=0; i<(int)PJ_ARRAY_SIZE(test_array); ++i) {
             pool = pjsip_endpt_create_pool(endpt, NULL, POOL_SIZE, POOL_SIZE);
             status = test_entry( pool, &test_array[i] );
@@ -1454 +1454 @@
         hname = pj_str(test->hname);
         len = strlen(test->hcontent);
-        parsed_hdr1 = pjsip_parse_hdr(pool, &hname, test->hcontent, len, &parsed_len);
+        parsed_hdr1 = (pjsip_hdr*) pjsip_parse_hdr(pool, &hname, 
+                                                   test->hcontent, len, 
+                                                   &parsed_len);
         if (parsed_hdr1 == NULL) {
             if (test->flags & HDR_FLAG_PARSE_FAIL) {
@@ -1476 +1478 @@
             hname = pj_str(test->hshort_name);
             len = strlen(test->hcontent);
-            parsed_hdr2 = pjsip_parse_hdr(pool, &hname, test->hcontent, len, &parsed_len);
+            parsed_hdr2 = (pjsip_hdr*) pjsip_parse_hdr(pool, &hname, test->hcontent, len, &parsed_len);
             if (parsed_hdr2 == NULL) {
                 PJ_LOG(3,(THIS_FILE, "    error parsing header %s: %s", test->hshort_name, test->hcontent));
@@ -1490 +1492 @@
 
         /* Print the original header */
-        input = pj_pool_alloc(pool, 1024);
+        input = (char*) pj_pool_alloc(pool, 1024);
         len = pj_ansi_snprintf(input, 1024, "%s: %s", test->hname, test->hcontent);
         if (len < 1 || len >= 1024)
@@ -1496 +1498 @@
 
         /* Print the parsed header*/
-        output = pj_pool_alloc(pool, 1024);
+        output = (char*) pj_pool_alloc(pool, 1024);
         len = pjsip_hdr_print_on(parsed_hdr1, output, 1024);
         if (len < 1 || len >= 1024) {