[svn-commits] rmudgett: branch rmudgett/mcid r254973 - /team/rmudgett/mcid/channels/sig_pri.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Mar 26 09:36:59 2010
New Revision: 254973

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=254973
Log:
Address Russell's comments about MCID event format.

Modified:
    team/rmudgett/mcid/channels/sig_pri.c

Modified: team/rmudgett/mcid/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/mcid/channels/sig_pri.c?view=diff&rev=254973&r1=254972&r2=254973
==============================================================================
--- team/rmudgett/mcid/channels/sig_pri.c (original)
+++ team/rmudgett/mcid/channels/sig_pri.c Fri Mar 26 09:36:59 2010
@@ -1495,21 +1495,21 @@
  */
 static void sig_pri_event_party_id(struct ast_str **msg, const char *prefix, struct ast_party_id *party)
 {
-	ast_str_append(msg, 0, "%s/Presentation: %d (%s)\r\n", prefix,
+	ast_str_append(msg, 0, "%sPres: %d (%s)\r\n", prefix,
 		party->number_presentation,
 		ast_describe_caller_presentation(party->number_presentation));
-	ast_str_append(msg, 0, "%s/Number: %s\r\n", prefix, S_OR(party->number, ""));
-	ast_str_append(msg, 0, "%s/TON: %d\r\n", prefix, party->number_type);
-	ast_str_append(msg, 0, "%s/Name: %s\r\n", prefix, S_OR(party->name, ""));
+	ast_str_append(msg, 0, "%sNum: %s\r\n", prefix, S_OR(party->number, ""));
+	ast_str_append(msg, 0, "%ston: %d\r\n", prefix, party->number_type);
+	ast_str_append(msg, 0, "%sName: %s\r\n", prefix, S_OR(party->name, ""));
 #if defined(HAVE_PRI_SUBADDR)
 	if (party->subaddress.valid) {
-		static const char subaddress[] = "Subaddress";
-
-		ast_str_append(msg, 0, "%s/%s: %s\r\n", prefix, subaddress,
+		static const char subaddress[] = "Subaddr";
+
+		ast_str_append(msg, 0, "%s%s: %s\r\n", prefix, subaddress,
 			S_OR(party->subaddress.str, ""));
-		ast_str_append(msg, 0, "%s/%s/Type: %d\r\n", prefix, subaddress,
+		ast_str_append(msg, 0, "%s%sType: %d\r\n", prefix, subaddress,
 			party->subaddress.type);
-		ast_str_append(msg, 0, "%s/%s/Odd: %d\r\n", prefix, subaddress,
+		ast_str_append(msg, 0, "%s%sOdd: %d\r\n", prefix, subaddress,
 			party->subaddress.odd_even_indicator);
 	}
 #endif	/* defined(HAVE_PRI_SUBADDR) */