Changeset 3254 for pjproject

Timestamp:

Aug 6, 2010 4:20:48 AM (14 years ago)

Author:

nanang

Message:

Misc (re #1068): fix compile error missing explicit casting for malloc in pjlib-test/ssl_sock.c on Symbian S60 5th ed (compiled as C++?).

File:

• pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c

@@ -204 +204 @@
 
     /* Duplicate parent test state to newly accepted test state */
-    st = pj_pool_zalloc(parent_st->pool, sizeof(struct test_state));
+    st = (struct test_state*)pj_pool_zalloc(parent_st->pool, sizeof(struct test_state));
     *st = *parent_st;
     pj_ssl_sock_set_user_data(newsock, st);
@@ -598 +598 @@
         state_cli.send_str_len = (pj_rand() % 5 + 1) * 1024 + pj_rand() % 1024;
     }
-    state_cli.send_str = pj_pool_alloc(pool, state_cli.send_str_len);
+    state_cli.send_str = (char*)pj_pool_alloc(pool, state_cli.send_str_len);
     {
         unsigned i;
@@ -1210 +1210 @@
 
     /* Allocate SSL socket pointers and test state */
-    ssock_cli = pj_pool_calloc(pool, clients, sizeof(pj_ssl_sock_t*));
-    state_cli = pj_pool_calloc(pool, clients, sizeof(struct test_state));
+    ssock_cli = (pj_ssl_sock_t**)pj_pool_calloc(pool, clients, sizeof(pj_ssl_sock_t*));
+    state_cli = (struct test_state*)pj_pool_calloc(pool, clients, sizeof(struct test_state));
 
     /* Get start timestamp */
@@ -1223 +1223 @@
         state_cli[i].check_echo = PJ_TRUE;
         state_cli[i].send_str_len = (pj_rand() % 5 + 1) * 1024 + pj_rand() % 1024;
-        state_cli[i].send_str = pj_pool_alloc(pool, state_cli[i].send_str_len);
+        state_cli[i].send_str = (char*)pj_pool_alloc(pool, state_cli[i].send_str_len);
         {
             unsigned j;