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

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4724 74dad513-b988-da41-8d7b-12977e46ad98

16 files changed, 42 insertions, 42 deletions

diff --git a/pjlib/include/pj/ioqueue.h b/pjlib/include/pj/ioqueue.h
index 1e983327..44ff2309 100644
--- a/pjlib/include/pj/ioqueue.h
+++ b/pjlib/include/pj/ioqueue.h
@@ -642,7 +642,7 @@ PJ_DECL(int) pj_ioqueue_poll( pj_ioqueue_t *ioque,
 /**
  * Instruct the I/O Queue to read from the specified handle. This function
  * returns immediately (i.e. non-blocking) regardless whether some data has 
- * been transfered. If the operation can't complete immediately, caller will 
+ * been transferred. If the operation can't complete immediately, caller will 
  * be notified about the completion when it calls pj_ioqueue_poll(). If data
  * is immediately available, the function will return PJ_SUCCESS and the
  * callback WILL NOT be called.
@@ -728,9 +728,9 @@ PJ_DECL(pj_status_t) pj_ioqueue_recvfrom( pj_ioqueue_key_t *key,
 /**
  * Instruct the I/O Queue to write to the handle. This function will return
  * immediately (i.e. non-blocking) regardless whether some data has been 
- * transfered. If the function can't complete immediately, the caller will
+ * transferred. If the function can't complete immediately, the caller will
  * be notified about the completion when it calls pj_ioqueue_poll(). If 
- * operation completes immediately and data has been transfered, the function
+ * operation completes immediately and data has been transferred, the function
  * returns PJ_SUCCESS and the callback will NOT be called.
  *
  * @param key	    The key that identifies the handle.
@@ -752,11 +752,11 @@ PJ_DECL(pj_status_t) pj_ioqueue_recvfrom( pj_ioqueue_key_t *key,
  *		    the function will never return PJ_SUCCESS.
  *
  * @return
- *  - PJ_SUCCESS    If data was immediately transfered. In this case, no
+ *  - PJ_SUCCESS    If data was immediately transferred. In this case, no
  *                  pending operation has been scheduled and the callback
  *                  WILL NOT be called.
  *  - PJ_EPENDING   If the operation has been queued. Once data base been
- *                  transfered, the callback will be called.
+ *                  transferred, the callback will be called.
  *  - non-zero      The return value indicates the error code.
  */
 PJ_DECL(pj_status_t) pj_ioqueue_send( pj_ioqueue_key_t *key,
@@ -769,9 +769,9 @@ PJ_DECL(pj_status_t) pj_ioqueue_send( pj_ioqueue_key_t *key,
 /**
  * Instruct the I/O Queue to write to the handle. This function will return
  * immediately (i.e. non-blocking) regardless whether some data has been 
- * transfered. If the function can't complete immediately, the caller will
+ * transferred. If the function can't complete immediately, the caller will
  * be notified about the completion when it calls pj_ioqueue_poll(). If 
- * operation completes immediately and data has been transfered, the function
+ * operation completes immediately and data has been transferred, the function
  * returns PJ_SUCCESS and the callback will NOT be called.
  *
  * @param key	    the key that identifies the handle.
diff --git a/pjlib/src/pj/ioqueue_winnt.c b/pjlib/src/pj/ioqueue_winnt.c
index 948727c6..20378fe4 100644
--- a/pjlib/src/pj/ioqueue_winnt.c
+++ b/pjlib/src/pj/ioqueue_winnt.c
@@ -633,19 +633,19 @@ static void decrement_counter(pj_ioqueue_key_t *key)
 
 /*
  * Poll the I/O Completion Port, execute callback, 
- * and return the key and bytes transfered of the last operation.
+ * and return the key and bytes transferred of the last operation.
  */
 static pj_bool_t poll_iocp( HANDLE hIocp, DWORD dwTimeout, 
 			    pj_ssize_t *p_bytes, pj_ioqueue_key_t **p_key )
 {
-    DWORD dwBytesTransfered, dwKey;
+    DWORD dwBytesTransferred, dwKey;
     generic_overlapped *pOv;
     pj_ioqueue_key_t *key;
     pj_ssize_t size_status = -1;
     BOOL rcGetQueued;
 
     /* Poll for completion status. */
-    rcGetQueued = GetQueuedCompletionStatus(hIocp, &dwBytesTransfered,
+    rcGetQueued = GetQueuedCompletionStatus(hIocp, &dwBytesTransferred,
 					    &dwKey, (OVERLAPPED**)&pOv, 
 					    dwTimeout);
 
@@ -659,7 +659,7 @@ static pj_bool_t poll_iocp( HANDLE hIocp, DWORD dwTimeout,
 
 	/* Event was dequeued for either successfull or failed I/O */
 	key = (pj_ioqueue_key_t*)dwKey;
-	size_status = dwBytesTransfered;
+	size_status = dwBytesTransferred;
 
 	/* Report to caller regardless */
 	if (p_bytes)
@@ -1381,10 +1381,10 @@ PJ_DEF(pj_bool_t) pj_ioqueue_is_pending( pj_ioqueue_key_t *key,
                                          pj_ioqueue_op_key_t *op_key )
 {
     BOOL rc;
-    DWORD bytesTransfered;
+    DWORD bytesTransferred;
 
     rc = GetOverlappedResult( key->hnd, (LPOVERLAPPED)op_key,
-                              &bytesTransfered, FALSE );
+                              &bytesTransferred, FALSE );
 
     if (rc == FALSE) {
         return GetLastError()==ERROR_IO_INCOMPLETE;
diff --git a/pjsip-apps/src/confbot/confbot.py b/pjsip-apps/src/confbot/confbot.py
index aa5efbf7..e7ed3142 100644
--- a/pjsip-apps/src/confbot/confbot.py
+++ b/pjsip-apps/src/confbot/confbot.py
@@ -197,7 +197,7 @@ class Member:
 		self.bot.broadcast_pager(None, msg)
 
 	def on_call_transfer_request(self, call, dst, code):
-		msg = "%(uri)s is transfering the call to %(dst)s" % \
+		msg = "%(uri)s is transferring the call to %(dst)s" % \
 			  {'uri': self.uri, 'dst': dst}
 		self.bot.broadcast_pager(None, msg)
 		return 202
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index 57aba6f0..95461073 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -782,7 +782,7 @@ static void on_call_transfer_status(pjsua_call_id call_id,
 
     if (status_code/100 == 2) {
 	PJ_LOG(3,(THIS_FILE, 
-	          "Call %d: call transfered successfully, disconnecting call",
+	          "Call %d: call transferred successfully, disconnecting call",
 		  call_id));
 	pjsua_call_hangup(call_id, PJSIP_SC_GONE, NULL, NULL);
 	*p_cont = PJ_FALSE;
diff --git a/pjsip-apps/src/pjsua/pjsua_app_cli.c b/pjsip-apps/src/pjsua/pjsua_app_cli.c
index c7481940..dd5351e3 100644
--- a/pjsip-apps/src/pjsua/pjsua_app_cli.c
+++ b/pjsip-apps/src/pjsua/pjsua_app_cli.c
@@ -1799,7 +1799,7 @@ static pj_status_t cmd_transfer_replace_call(pj_cli_cmd_val *cval)
 	if (dst_call == call) {
 	    static pj_str_t err_same_num = 
 				    {"Destination call number must not be the "
-				     "same as the call being transfered\n", 74};
+				     "same as the call being transferred\n", 74};
 
 	    pj_cli_sess_write_msg(cval->sess, err_same_num.ptr, 
 				  err_same_num.slen);
diff --git a/pjsip-apps/src/pjsua/pjsua_app_legacy.c b/pjsip-apps/src/pjsua/pjsua_app_legacy.c
index f3bed8cb..6f4b2ff3 100644
--- a/pjsip-apps/src/pjsua/pjsua_app_legacy.c
+++ b/pjsip-apps/src/pjsua/pjsua_app_legacy.c
@@ -1163,7 +1163,7 @@ static void ui_call_transfer_replaces(pj_bool_t no_refersub)
 	/* Check that destination call is valid. */
 	if (dst_call == call) {
 	    puts("Destination call number must not be the same "
-		"as the call being transfered");
+		"as the call being transferred");
 	    return;
 	}
 	if (dst_call >= PJSUA_MAX_CALLS) {
diff --git a/pjsip-apps/src/py_pjsua/pjsua_app.py b/pjsip-apps/src/py_pjsua/pjsua_app.py
index 29c2b756..d8e208a9 100644
--- a/pjsip-apps/src/py_pjsua/pjsua_app.py
+++ b/pjsip-apps/src/py_pjsua/pjsua_app.py
@@ -157,7 +157,7 @@ def on_call_transfer_status(call_id,status_code,status_text,final,p_cont):
 	write_log(3, "Call " + `call_id` + ": transfer status= " + `status_code` + " " + status_text+ " " + strfinal)
 	      
 	if status_code/100 == 2:
-		write_log(3, "Call " + `call_id` + " : call transfered successfully, disconnecting call")
+		write_log(3, "Call " + `call_id` + " : call transferred successfully, disconnecting call")
 		status = py_pjsua.call_hangup(call_id, 410, None, None)
 		p_cont = 0
 
@@ -423,9 +423,9 @@ def xfer_call():
 		msg_data = py_pjsua.msg_data_init()
 		status = py_pjsua.call_xfer(g_current_call, url, msg_data);
 		if status != 0:
-			py_pjsua.perror(THIS_FILE, "Error transfering call ", status)
+			py_pjsua.perror(THIS_FILE, "Error transferring call ", status)
 		else:		
-			write_log(3, "Call transfered to " + url)
+			write_log(3, "Call transferred to " + url)
 		
 def xfer_call_replaces():
 	if g_current_call == -1:
@@ -458,7 +458,7 @@ def xfer_call_replaces():
 			return		
 		
 		if dst_call == call:
-			print "Destination call number must not be the same as the call being transfered"
+			print "Destination call number must not be the same as the call being transferred"
 			return
 		
 		if dst_call >= py_pjsua.PJSUA_MAX_CALLS:
diff --git a/pjsip-apps/src/py_pjsua/py_pjsua.c b/pjsip-apps/src/py_pjsua/py_pjsua.c
index 2766d17a..7ef55d82 100644
--- a/pjsip-apps/src/py_pjsua/py_pjsua.c
+++ b/pjsip-apps/src/py_pjsua/py_pjsua.c
@@ -174,7 +174,7 @@ static void cb_on_dtmf_digit(pjsua_call_id call_id, int digit)
 
 
 /*
- * Notify application on call being transfered.
+ * Notify application on call being transferred.
  * !modified @061206
  */
 static void cb_on_call_transfer_request(pjsua_call_id call_id,
diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c
index dffd3b86..fb80e239 100644
--- a/pjsip-apps/src/python/_pjsua.c
+++ b/pjsip-apps/src/python/_pjsua.c
@@ -208,7 +208,7 @@ static void cb_on_dtmf_digit(pjsua_call_id call_id, int digit)
 
 
 /*
- * Notify application on call being transfered.
+ * Notify application on call being transferred.
  * !modified @061206
  */
 static void cb_on_call_transfer_request(pjsua_call_id call_id,
diff --git a/pjsip-apps/src/python/_pjsua.h b/pjsip-apps/src/python/_pjsua.h
index 4771148f..b4007200 100644
--- a/pjsip-apps/src/python/_pjsua.h
+++ b/pjsip-apps/src/python/_pjsua.h
@@ -332,7 +332,7 @@ static PyMemberDef PyObj_pjsua_callback_members[] =
     {
         "on_call_transfer_request", T_OBJECT_EX,
         offsetof(PyObj_pjsua_callback, on_call_transfer_request), 0,
-        "Notify application on call being transfered. "
+        "Notify application on call being transferred. "
 	"Application can decide to accept/reject transfer request "
 	"by setting the code (default is 200). When this callback "
 	"is not defined, the default behavior is to accept the "
diff --git a/pjsip-apps/src/python/pjsua.py b/pjsip-apps/src/python/pjsua.py
index 6dc5efe1..9b2fbfe6 100644
--- a/pjsip-apps/src/python/pjsua.py
+++ b/pjsip-apps/src/python/pjsua.py
@@ -1386,7 +1386,7 @@ class CallCallback:
         pass
 
     def on_transfer_request(self, dst, code):
-        """Notification that call is being transfered by remote party. 
+        """Notification that call is being transferred by remote party. 
 
         Application can decide to accept/reject transfer request by returning
         code greater than or equal to 500. The default behavior is to accept 
diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
index 7ee3d6cf..4dc2187c 100644
--- a/pjsip/include/pjsua-lib/pjsua.h
+++ b/pjsip/include/pjsua-lib/pjsua.h
@@ -756,7 +756,7 @@ typedef struct pjsua_callback
     void (*on_dtmf_digit)(pjsua_call_id call_id, int digit);
 
     /**
-     * Notify application on call being transfered (i.e. REFER is received).
+     * Notify application on call being transferred (i.e. REFER is received).
      * Application can decide to accept/reject transfer request
      * by setting the code (default is 202). When this callback
      * is not defined, the default behavior is to accept the
@@ -765,7 +765,7 @@ typedef struct pjsua_callback
      *
      * @param call_id	The call index.
      * @param dst	The destination where the call will be 
-     *			transfered to.
+     *			transferred to.
      * @param code	Status code to be returned for the call transfer
      *			request. On input, it contains status code 200.
      */
@@ -774,7 +774,7 @@ typedef struct pjsua_callback
 				     pjsip_status_code *code);
 
     /**
-     * Notify application on call being transfered (i.e. REFER is received).
+     * Notify application on call being transferred (i.e. REFER is received).
      * Application can decide to accept/reject transfer request
      * by setting the code (default is 202). When this callback
      * is not defined, the default behavior is to accept the
@@ -782,11 +782,11 @@ typedef struct pjsua_callback
      *
      * @param call_id	The call index.
      * @param dst	The destination where the call will be 
-     *			transfered to.
+     *			transferred to.
      * @param code	Status code to be returned for the call transfer
      *			request. On input, it contains status code 200.
      * @param opt	The current call setting, application can update
-     *			this setting for the call being transfered.
+     *			this setting for the call being transferred.
      */
     void (*on_call_transfer_request2)(pjsua_call_id call_id,
 				      const pj_str_t *dst,
@@ -4651,7 +4651,7 @@ PJ_DECL(pj_status_t) pjsua_call_update2(pjsua_call_id call_id,
  * \a on_call_transfer_status() callback which will report the progress
  * of the call transfer request.
  *
- * @param call_id	The call id to be transfered.
+ * @param call_id	The call id to be transferred.
  * @param dest		URI of new target to be contacted. The URI may be
  * 			in name address or addr-spec format.
  * @param msg_data	Optional message components to be sent with
@@ -4676,7 +4676,7 @@ PJ_DECL(pj_status_t) pjsua_call_xfer(pjsua_call_id call_id,
  * of \a dest_call_id. The party at \a dest_call_id then should "replace"
  * the call with us with the new call from the REFER recipient.
  *
- * @param call_id	The call id to be transfered.
+ * @param call_id	The call id to be transferred.
  * @param dest_call_id	The call id to be replaced.
  * @param options	Application may specify PJSUA_XFER_NO_REQUIRE_REPLACES
  *			to suppress the inclusion of "Require: replaces" in
diff --git a/pjsip/include/pjsua2/call.hpp b/pjsip/include/pjsua2/call.hpp
index f16db153..c4978e38 100644
--- a/pjsip/include/pjsua2/call.hpp
+++ b/pjsip/include/pjsua2/call.hpp
@@ -726,7 +726,7 @@ struct OnDtmfDigitParam
 struct OnCallTransferRequestParam
 {
     /**
-     * The destination where the call will be transfered to.
+     * The destination where the call will be transferred to.
      */
     string              dstUri;
     
@@ -738,7 +738,7 @@ struct OnCallTransferRequestParam
     
     /**
      * The current call setting, application can update this setting
-     * for the call being transfered.
+     * for the call being transferred.
      */
     CallSetting         opt;
 };
@@ -1529,7 +1529,7 @@ public:
     { PJ_UNUSED_ARG(prm); }
     
     /**
-     * Notify application on call being transfered (i.e. REFER is received).
+     * Notify application on call being transferred (i.e. REFER is received).
      * Application can decide to accept/reject transfer request
      * by setting the code (default is 202). When this callback
      * is not implemented, the default behavior is to accept the
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c
index ff64e1e4..a363b7ff 100644
--- a/pjsip/src/pjsua-lib/pjsua_call.c
+++ b/pjsip/src/pjsua-lib/pjsua_call.c
@@ -4031,7 +4031,7 @@ static void xfer_client_on_evsub_state( pjsip_evsub *sub, pjsip_event *event)
 	/* Check if subscription is suppressed */
 	if (refer_sub && pj_stricmp2(&refer_sub->hvalue, "false")==0) {
 	    /* Since no subscription is desired, assume that call has been
-	     * transfered successfully.
+	     * transferred successfully.
 	     */
 	    if (call && pjsua_var.ua_cfg.cb.on_call_transfer_status) {
 		const pj_str_t ACCEPTED = { "Accepted", 8 };
@@ -4202,7 +4202,7 @@ on_return:
 /*
  * Follow transfer (REFER) request.
  */
-static void on_call_transfered( pjsip_inv_session *inv,
+static void on_call_transferred( pjsip_inv_session *inv,
 			        pjsip_rx_data *rdata )
 {
     pj_status_t status;
@@ -4280,7 +4280,7 @@ static void on_call_transfered( pjsip_inv_session *inv,
 	goto on_return;
     }
 
-    PJ_LOG(3,(THIS_FILE, "Call to %.*s is being transfered to %.*s",
+    PJ_LOG(3,(THIS_FILE, "Call to %.*s is being transferred to %.*s",
 	      (int)inv->dlg->remote.info_str.slen,
 	      inv->dlg->remote.info_str.ptr,
 	      (int)refer_to->hvalue.slen, 
@@ -4486,7 +4486,7 @@ static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv,
 	/*
 	 * Incoming REFER request.
 	 */
-	on_call_transfered(call->inv, e->body.tsx_state.src.rdata);
+	on_call_transferred(call->inv, e->body.tsx_state.src.rdata);
 
     }
     else if (tsx->role==PJSIP_ROLE_UAS &&
diff --git a/tests/pjsua/scripts-sipp/transfer-attended.py b/tests/pjsua/scripts-sipp/transfer-attended.py
index 3e4f80a4..c9f35c01 100644
--- a/tests/pjsua/scripts-sipp/transfer-attended.py
+++ b/tests/pjsua/scripts-sipp/transfer-attended.py
@@ -41,11 +41,11 @@ PJSUA_EXPECTS = [
 		 # B transfer A to C
 		 [1, "", "X"],
 		 [1, "", "1"],
-		 [0, "Call .* is being transfered", ""],
+		 [0, "Call .* is being transferred", ""],
 		 [1, "Subscription state .* ACCEPTED", ""],
 		 [0, const.STATE_CALLING, ""],
 		 [2, "Call .* is being replaced", ""],
-		 [1, "call transfered successfully", ""],
+		 [1, "call transferred successfully", ""],
 		 [0, const.MEDIA_ACTIVE, ""],
 		 [2, const.MEDIA_ACTIVE, ""],
 		 [1, const.STATE_DISCONNECTED, ""]
diff --git a/tests/pjsua/scripts-sipp/transfer-unattended.py b/tests/pjsua/scripts-sipp/transfer-unattended.py
index 37c97124..7921d2a4 100644
--- a/tests/pjsua/scripts-sipp/transfer-unattended.py
+++ b/tests/pjsua/scripts-sipp/transfer-unattended.py
@@ -25,6 +25,6 @@ PJSUA_EXPECTS = [
 		 [2, "", "200"],
 		 [0, const.MEDIA_ACTIVE, ""],
 		 [2, const.MEDIA_ACTIVE, ""],
-		 [1, "call transfered successfully", ""],
+		 [1, "call transferred successfully", ""],
 		 [1, const.STATE_DISCONNECTED, ""]
 		]