Changeset 4724


Ignore:
Timestamp:
Jan 31, 2014 8:52:09 AM (7 years ago)
Author:
nanang
Message:

Misc (re #1630): Fixed some more typos in the codes.

Location:
pjproject/trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/include/pj/ioqueue.h

    r4359 r4724  
    643643 * Instruct the I/O Queue to read from the specified handle. This function 
    644644 * returns immediately (i.e. non-blocking) regardless whether some data has  
    645  * been transfered. If the operation can't complete immediately, caller will  
     645 * been transferred. If the operation can't complete immediately, caller will  
    646646 * be notified about the completion when it calls pj_ioqueue_poll(). If data 
    647647 * is immediately available, the function will return PJ_SUCCESS and the 
     
    729729 * Instruct the I/O Queue to write to the handle. This function will return 
    730730 * immediately (i.e. non-blocking) regardless whether some data has been  
    731  * transfered. If the function can't complete immediately, the caller will 
     731 * transferred. If the function can't complete immediately, the caller will 
    732732 * be notified about the completion when it calls pj_ioqueue_poll(). If  
    733  * operation completes immediately and data has been transfered, the function 
     733 * operation completes immediately and data has been transferred, the function 
    734734 * returns PJ_SUCCESS and the callback will NOT be called. 
    735735 * 
     
    753753 * 
    754754 * @return 
    755  *  - PJ_SUCCESS    If data was immediately transfered. In this case, no 
     755 *  - PJ_SUCCESS    If data was immediately transferred. In this case, no 
    756756 *                  pending operation has been scheduled and the callback 
    757757 *                  WILL NOT be called. 
    758758 *  - PJ_EPENDING   If the operation has been queued. Once data base been 
    759  *                  transfered, the callback will be called. 
     759 *                  transferred, the callback will be called. 
    760760 *  - non-zero      The return value indicates the error code. 
    761761 */ 
     
    770770 * Instruct the I/O Queue to write to the handle. This function will return 
    771771 * immediately (i.e. non-blocking) regardless whether some data has been  
    772  * transfered. If the function can't complete immediately, the caller will 
     772 * transferred. If the function can't complete immediately, the caller will 
    773773 * be notified about the completion when it calls pj_ioqueue_poll(). If  
    774  * operation completes immediately and data has been transfered, the function 
     774 * operation completes immediately and data has been transferred, the function 
    775775 * returns PJ_SUCCESS and the callback will NOT be called. 
    776776 * 
  • pjproject/trunk/pjlib/src/pj/ioqueue_winnt.c

    r3553 r4724  
    634634/* 
    635635 * Poll the I/O Completion Port, execute callback,  
    636  * and return the key and bytes transfered of the last operation. 
     636 * and return the key and bytes transferred of the last operation. 
    637637 */ 
    638638static pj_bool_t poll_iocp( HANDLE hIocp, DWORD dwTimeout,  
    639639                            pj_ssize_t *p_bytes, pj_ioqueue_key_t **p_key ) 
    640640{ 
    641     DWORD dwBytesTransfered, dwKey; 
     641    DWORD dwBytesTransferred, dwKey; 
    642642    generic_overlapped *pOv; 
    643643    pj_ioqueue_key_t *key; 
     
    646646 
    647647    /* Poll for completion status. */ 
    648     rcGetQueued = GetQueuedCompletionStatus(hIocp, &dwBytesTransfered, 
     648    rcGetQueued = GetQueuedCompletionStatus(hIocp, &dwBytesTransferred, 
    649649                                            &dwKey, (OVERLAPPED**)&pOv,  
    650650                                            dwTimeout); 
     
    660660        /* Event was dequeued for either successfull or failed I/O */ 
    661661        key = (pj_ioqueue_key_t*)dwKey; 
    662         size_status = dwBytesTransfered; 
     662        size_status = dwBytesTransferred; 
    663663 
    664664        /* Report to caller regardless */ 
     
    13821382{ 
    13831383    BOOL rc; 
    1384     DWORD bytesTransfered; 
     1384    DWORD bytesTransferred; 
    13851385 
    13861386    rc = GetOverlappedResult( key->hnd, (LPOVERLAPPED)op_key, 
    1387                               &bytesTransfered, FALSE ); 
     1387                              &bytesTransferred, FALSE ); 
    13881388 
    13891389    if (rc == FALSE) { 
  • pjproject/trunk/pjsip-apps/src/confbot/confbot.py

    r2912 r4724  
    198198 
    199199        def on_call_transfer_request(self, call, dst, code): 
    200                 msg = "%(uri)s is transfering the call to %(dst)s" % \ 
     200                msg = "%(uri)s is transferring the call to %(dst)s" % \ 
    201201                          {'uri': self.uri, 'dst': dst} 
    202202                self.bot.broadcast_pager(None, msg) 
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

    r4634 r4724  
    783783    if (status_code/100 == 2) { 
    784784        PJ_LOG(3,(THIS_FILE,  
    785                   "Call %d: call transfered successfully, disconnecting call", 
     785                  "Call %d: call transferred successfully, disconnecting call", 
    786786                  call_id)); 
    787787        pjsua_call_hangup(call_id, PJSIP_SC_GONE, NULL, NULL); 
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c

    r4714 r4724  
    18001800            static pj_str_t err_same_num =  
    18011801                                    {"Destination call number must not be the " 
    1802                                      "same as the call being transfered\n", 74}; 
     1802                                     "same as the call being transferred\n", 74}; 
    18031803 
    18041804            pj_cli_sess_write_msg(cval->sess, err_same_num.ptr,  
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c

    r4714 r4724  
    11641164        if (dst_call == call) { 
    11651165            puts("Destination call number must not be the same " 
    1166                 "as the call being transfered"); 
     1166                "as the call being transferred"); 
    11671167            return; 
    11681168        } 
  • pjproject/trunk/pjsip-apps/src/py_pjsua/pjsua_app.py

    r4714 r4724  
    158158               
    159159        if status_code/100 == 2: 
    160                 write_log(3, "Call " + `call_id` + " : call transfered successfully, disconnecting call") 
     160                write_log(3, "Call " + `call_id` + " : call transferred successfully, disconnecting call") 
    161161                status = py_pjsua.call_hangup(call_id, 410, None, None) 
    162162                p_cont = 0 
     
    424424                status = py_pjsua.call_xfer(g_current_call, url, msg_data); 
    425425                if status != 0: 
    426                         py_pjsua.perror(THIS_FILE, "Error transfering call ", status) 
     426                        py_pjsua.perror(THIS_FILE, "Error transferring call ", status) 
    427427                else:            
    428                         write_log(3, "Call transfered to " + url) 
     428                        write_log(3, "Call transferred to " + url) 
    429429                 
    430430def xfer_call_replaces(): 
     
    459459                 
    460460                if dst_call == call: 
    461                         print "Destination call number must not be the same as the call being transfered" 
     461                        print "Destination call number must not be the same as the call being transferred" 
    462462                        return 
    463463                 
  • pjproject/trunk/pjsip-apps/src/py_pjsua/py_pjsua.c

    r3553 r4724  
    175175 
    176176/* 
    177  * Notify application on call being transfered. 
     177 * Notify application on call being transferred. 
    178178 * !modified @061206 
    179179 */ 
  • pjproject/trunk/pjsip-apps/src/python/_pjsua.c

    r4609 r4724  
    209209 
    210210/* 
    211  * Notify application on call being transfered. 
     211 * Notify application on call being transferred. 
    212212 * !modified @061206 
    213213 */ 
  • pjproject/trunk/pjsip-apps/src/python/_pjsua.h

    r4609 r4724  
    333333        "on_call_transfer_request", T_OBJECT_EX, 
    334334        offsetof(PyObj_pjsua_callback, on_call_transfer_request), 0, 
    335         "Notify application on call being transfered. " 
     335        "Notify application on call being transferred. " 
    336336        "Application can decide to accept/reject transfer request " 
    337337        "by setting the code (default is 200). When this callback " 
  • pjproject/trunk/pjsip-apps/src/python/pjsua.py

    r4611 r4724  
    13871387 
    13881388    def on_transfer_request(self, dst, code): 
    1389         """Notification that call is being transfered by remote party.  
     1389        """Notification that call is being transferred by remote party.  
    13901390 
    13911391        Application can decide to accept/reject transfer request by returning 
  • pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

    r4704 r4724  
    757757 
    758758    /** 
    759      * Notify application on call being transfered (i.e. REFER is received). 
     759     * Notify application on call being transferred (i.e. REFER is received). 
    760760     * Application can decide to accept/reject transfer request 
    761761     * by setting the code (default is 202). When this callback 
     
    766766     * @param call_id   The call index. 
    767767     * @param dst       The destination where the call will be  
    768      *                  transfered to. 
     768     *                  transferred to. 
    769769     * @param code      Status code to be returned for the call transfer 
    770770     *                  request. On input, it contains status code 200. 
     
    775775 
    776776    /** 
    777      * Notify application on call being transfered (i.e. REFER is received). 
     777     * Notify application on call being transferred (i.e. REFER is received). 
    778778     * Application can decide to accept/reject transfer request 
    779779     * by setting the code (default is 202). When this callback 
     
    783783     * @param call_id   The call index. 
    784784     * @param dst       The destination where the call will be  
    785      *                  transfered to. 
     785     *                  transferred to. 
    786786     * @param code      Status code to be returned for the call transfer 
    787787     *                  request. On input, it contains status code 200. 
    788788     * @param opt       The current call setting, application can update 
    789      *                  this setting for the call being transfered. 
     789     *                  this setting for the call being transferred. 
    790790     */ 
    791791    void (*on_call_transfer_request2)(pjsua_call_id call_id, 
     
    46524652 * of the call transfer request. 
    46534653 * 
    4654  * @param call_id       The call id to be transfered. 
     4654 * @param call_id       The call id to be transferred. 
    46554655 * @param dest          URI of new target to be contacted. The URI may be 
    46564656 *                      in name address or addr-spec format. 
     
    46774677 * the call with us with the new call from the REFER recipient. 
    46784678 * 
    4679  * @param call_id       The call id to be transfered. 
     4679 * @param call_id       The call id to be transferred. 
    46804680 * @param dest_call_id  The call id to be replaced. 
    46814681 * @param options       Application may specify PJSUA_XFER_NO_REQUIRE_REPLACES 
  • pjproject/trunk/pjsip/include/pjsua2/call.hpp

    r4704 r4724  
    727727{ 
    728728    /** 
    729      * The destination where the call will be transfered to. 
     729     * The destination where the call will be transferred to. 
    730730     */ 
    731731    string              dstUri; 
     
    739739    /** 
    740740     * The current call setting, application can update this setting 
    741      * for the call being transfered. 
     741     * for the call being transferred. 
    742742     */ 
    743743    CallSetting         opt; 
     
    15301530     
    15311531    /** 
    1532      * Notify application on call being transfered (i.e. REFER is received). 
     1532     * Notify application on call being transferred (i.e. REFER is received). 
    15331533     * Application can decide to accept/reject transfer request 
    15341534     * by setting the code (default is 202). When this callback 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

    r4714 r4724  
    40324032        if (refer_sub && pj_stricmp2(&refer_sub->hvalue, "false")==0) { 
    40334033            /* Since no subscription is desired, assume that call has been 
    4034              * transfered successfully. 
     4034             * transferred successfully. 
    40354035             */ 
    40364036            if (call && pjsua_var.ua_cfg.cb.on_call_transfer_status) { 
     
    42034203 * Follow transfer (REFER) request. 
    42044204 */ 
    4205 static void on_call_transfered( pjsip_inv_session *inv, 
     4205static void on_call_transferred( pjsip_inv_session *inv, 
    42064206                                pjsip_rx_data *rdata ) 
    42074207{ 
     
    42814281    } 
    42824282 
    4283     PJ_LOG(3,(THIS_FILE, "Call to %.*s is being transfered to %.*s", 
     4283    PJ_LOG(3,(THIS_FILE, "Call to %.*s is being transferred to %.*s", 
    42844284              (int)inv->dlg->remote.info_str.slen, 
    42854285              inv->dlg->remote.info_str.ptr, 
     
    44874487         * Incoming REFER request. 
    44884488         */ 
    4489         on_call_transfered(call->inv, e->body.tsx_state.src.rdata); 
     4489        on_call_transferred(call->inv, e->body.tsx_state.src.rdata); 
    44904490 
    44914491    } 
  • pjproject/trunk/tests/pjsua/scripts-sipp/transfer-attended.py

    r4188 r4724  
    4242                 [1, "", "X"], 
    4343                 [1, "", "1"], 
    44                  [0, "Call .* is being transfered", ""], 
     44                 [0, "Call .* is being transferred", ""], 
    4545                 [1, "Subscription state .* ACCEPTED", ""], 
    4646                 [0, const.STATE_CALLING, ""], 
    4747                 [2, "Call .* is being replaced", ""], 
    48                  [1, "call transfered successfully", ""], 
     48                 [1, "call transferred successfully", ""], 
    4949                 [0, const.MEDIA_ACTIVE, ""], 
    5050                 [2, const.MEDIA_ACTIVE, ""], 
  • pjproject/trunk/tests/pjsua/scripts-sipp/transfer-unattended.py

    r4188 r4724  
    2626                 [0, const.MEDIA_ACTIVE, ""], 
    2727                 [2, const.MEDIA_ACTIVE, ""], 
    28                  [1, "call transfered successfully", ""], 
     28                 [1, "call transferred successfully", ""], 
    2929                 [1, const.STATE_DISCONNECTED, ""] 
    3030                ] 
Note: See TracChangeset for help on using the changeset viewer.