[svn-commits] rmudgett: branch rmudgett/cid r270515 - in /team/rmudgett/cid: include/asteri...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Jun 15 10:13:41 2010
New Revision: 270515

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=270515
Log:
Address mmichelson's initial review board comments.

Modified:
    team/rmudgett/cid/include/asterisk/channel.h
    team/rmudgett/cid/main/channel.c

Modified: team/rmudgett/cid/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/include/asterisk/channel.h?view=diff&rev=270515&r1=270514&r2=270515
==============================================================================
--- team/rmudgett/cid/include/asterisk/channel.h (original)
+++ team/rmudgett/cid/include/asterisk/channel.h Tue Jun 15 10:13:41 2010
@@ -221,7 +221,7 @@
 	int char_set;
 	/*!
 	 * \brief Q.931 encoded presentation-indicator encoded field
-	 * \note Must tollerate the Q.931 screening-indicator field values being present.
+	 * \note Must tolerate the Q.931 screening-indicator field values being present.
 	 */
 	int presentation;
 	/*! \brief TRUE if the name information is valid/present */

Modified: team/rmudgett/cid/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/main/channel.c?view=diff&rev=270515&r1=270514&r2=270515
==============================================================================
--- team/rmudgett/cid/main/channel.c (original)
+++ team/rmudgett/cid/main/channel.c Tue Jun 15 10:13:41 2010
@@ -7298,7 +7298,7 @@
  * \retval -1 if error
  * \retval Amount of data buffer used
  */
-static int ast_party_name_build_data(unsigned char *data, size_t datalen, const struct ast_party_name *name, const char *label, const struct ast_party_name_ies *ies)
+static int party_name_build_data(unsigned char *data, size_t datalen, const struct ast_party_name *name, const char *label, const struct ast_party_name_ies *ies)
 {
 	size_t length;
 	size_t pos = 0;
@@ -7372,7 +7372,7 @@
  * \retval -1 if error
  * \retval Amount of data buffer used
  */
-static int ast_party_number_build_data(unsigned char *data, size_t datalen, const struct ast_party_number *number, const char *label, const struct ast_party_number_ies *ies)
+static int party_number_build_data(unsigned char *data, size_t datalen, const struct ast_party_number *number, const char *label, const struct ast_party_number_ies *ies)
 {
 	size_t length;
 	size_t pos = 0;
@@ -7446,7 +7446,7 @@
  * \retval -1 if error
  * \retval Amount of data buffer used
  */
-static int ast_party_subaddress_build_data(unsigned char *data, size_t datalen, const struct ast_party_subaddress *subaddress, const char *label, const struct ast_party_subaddress_ies *ies)
+static int party_subaddress_build_data(unsigned char *data, size_t datalen, const struct ast_party_subaddress *subaddress, const char *label, const struct ast_party_subaddress_ies *ies)
 {
 	size_t length;
 	size_t pos = 0;
@@ -7524,7 +7524,7 @@
  * \retval -1 if error
  * \retval Amount of data buffer used
  */
-static int ast_party_id_build_data(unsigned char *data, size_t datalen,
+static int party_id_build_data(unsigned char *data, size_t datalen,
 	const struct ast_party_id *id, const char *label, const struct ast_party_id_ies *ies,
 	const struct ast_set_party_id *update)
 {
@@ -7538,7 +7538,7 @@
 	 */
 
 	if (!update || update->name) {
-		res = ast_party_name_build_data(data + pos, datalen - pos, &id->XXX_name, label,
+		res = party_name_build_data(data + pos, datalen - pos, &id->XXX_name, label,
 			&ies->name);
 		if (res < 0) {
 			return -1;
@@ -7547,7 +7547,7 @@
 	}
 
 	if (!update || update->number) {
-		res = ast_party_number_build_data(data + pos, datalen - pos, &id->XXX_number, label,
+		res = party_number_build_data(data + pos, datalen - pos, &id->XXX_number, label,
 			&ies->number);
 		if (res < 0) {
 			return -1;
@@ -7556,7 +7556,7 @@
 	}
 
 	if (!update || update->subaddress) {
-		res = ast_party_subaddress_build_data(data + pos, datalen - pos, &id->subaddress,
+		res = party_subaddress_build_data(data + pos, datalen - pos, &id->subaddress,
 			label, &ies->subaddress);
 		if (res < 0) {
 			return -1;
@@ -7667,7 +7667,7 @@
 	data[pos++] = 1;
 	data[pos++] = 2;/* Version 1 did not have a version ie */
 
-	res = ast_party_id_build_data(data + pos, datalen - pos, &connected->id,
+	res = party_id_build_data(data + pos, datalen - pos, &connected->id,
 		"connected line", &ies, update ? &update->id : NULL);
 	if (res < 0) {
 		return -1;
@@ -8017,14 +8017,14 @@
 	data[pos++] = 1;
 	data[pos++] = 2;/* Version 1 did not have a version ie */
 
-	res = ast_party_id_build_data(data + pos, datalen - pos, &redirecting->from,
+	res = party_id_build_data(data + pos, datalen - pos, &redirecting->from,
 		"redirecting-from", &from_ies, update ? &update->from : NULL);
 	if (res < 0) {
 		return -1;
 	}
 	pos += res;
 
-	res = ast_party_id_build_data(data + pos, datalen - pos, &redirecting->to,
+	res = party_id_build_data(data + pos, datalen - pos, &redirecting->to,
 		"redirecting-to", &to_ies, update ? &update->to : NULL);
 	if (res < 0) {
 		return -1;