Ignore:
Timestamp:
May 11, 2007 3:14:34 PM (14 years ago)
Author:
bennylp
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsip/sip_transport_tls_ossl.c

    r1088 r1266  
    260260{ 
    261261    enum { M = 48 }; 
    262     host_port->host.ptr = pj_pool_alloc(pool, M); 
     262    host_port->host.ptr = (char*)pj_pool_alloc(pool, M); 
    263263    host_port->host.slen = pj_ansi_snprintf( host_port->host.ptr, M, "%s",  
    264264                                            pj_inet_ntoa(addr->sin_addr)); 
     
    270270static int password_cb(char *buf, int num, int rwflag, void *user_data) 
    271271{ 
    272     struct tls_listener *lis = user_data; 
     272    struct tls_listener *lis = (struct tls_listener*) user_data; 
    273273 
    274274    PJ_UNUSED_ARG(rwflag); 
     
    905905 
    906906 
    907     listener = pj_pool_zalloc(pool, sizeof(struct tls_listener)); 
     907    listener = PJ_POOL_ZALLOC_T(pool, struct tls_listener); 
    908908    listener->factory.pool = pool; 
    909909    listener->factory.type = PJSIP_TRANSPORT_TLS; 
     
    10371037        } 
    10381038 
    1039         listener->accept_op[i] = pj_pool_zalloc(pool,  
    1040                                                 sizeof(struct pending_accept)); 
     1039        listener->accept_op[i] = PJ_POOL_ZALLOC_T(pool, struct pending_accept); 
    10411040        pj_ioqueue_op_key_init(&listener->accept_op[i]->op_key,  
    10421041                                sizeof(listener->accept_op[i]->op_key)); 
     
    11921191     * Create and initialize basic transport structure. 
    11931192     */ 
    1194     tls = pj_pool_zalloc(pool, sizeof(*tls)); 
     1193    tls = PJ_POOL_ZALLOC_T(pool, struct tls_transport); 
    11951194    tls->sock = sock; 
    11961195    tls->is_server = is_server; 
     
    12181217    tls->base.flag = pjsip_transport_get_flag_from_type(PJSIP_TRANSPORT_TLS); 
    12191218 
    1220     tls->base.info = pj_pool_alloc(pool, 64); 
     1219    tls->base.info = (char*) pj_pool_alloc(pool, 64); 
    12211220    pj_ansi_snprintf(tls->base.info, 64, "TLS to %s:%d", 
    12221221                     pj_inet_ntoa(remote->sin_addr),  
     
    16361635    int err_cnt = 0; 
    16371636 
    1638     listener = pj_ioqueue_get_user_data(key); 
     1637    listener = (struct tls_listener*) pj_ioqueue_get_user_data(key); 
    16391638    accept_op = (struct pending_accept*) op_key; 
    16401639 
     
    16951694            pool = pjsip_endpt_create_pool(listener->endpt, "tlss%p",  
    16961695                                           POOL_TP_INIT, POOL_TP_INC); 
    1697             new_op = pj_pool_zalloc(pool, sizeof(struct pending_accept)); 
     1696            new_op = PJ_POOL_ZALLOC_T(pool, struct pending_accept); 
    16981697            new_op->pool = pool; 
    16991698            new_op->listener = listener; 
     
    17571756                              pj_ssize_t bytes_sent) 
    17581757{ 
    1759     struct tls_transport *tls = pj_ioqueue_get_user_data(key); 
     1758    struct tls_transport *tls; 
    17601759    pjsip_tx_data_op_key *tdata_op_key = (pjsip_tx_data_op_key*)op_key; 
    17611760 
     1761    tls = (struct tls_transport*) pj_ioqueue_get_user_data(key); 
    17621762    tdata_op_key->tdata = NULL; 
    17631763 
     
    17901790    struct delayed_tdata *delayed_tdata; 
    17911791 
    1792     delayed_tdata = pj_pool_alloc(tdata->pool,  
    1793                                   sizeof(*delayed_tdata)); 
     1792    delayed_tdata = PJ_POOL_ALLOC_T(tdata->pool, struct delayed_tdata); 
    17941793    delayed_tdata->tdata_op_key = &tdata->op_key; 
    17951794    pj_list_push_back(&tls->delayed_list, delayed_tdata); 
     
    20982097    int addrlen; 
    20992098 
    2100     tls = pj_ioqueue_get_user_data(key); 
     2099    tls = (struct tls_transport*) pj_ioqueue_get_user_data(key); 
    21012100 
    21022101    /* Check connect() status */ 
Note: See TracChangeset for help on using the changeset viewer.