[svn-commits] rmudgett: branch rmudgett/cid r272443 - in /team/rmudgett/cid: funcs/ main/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Jun 24 15:16:49 2010
New Revision: 272443

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

Modified:
    team/rmudgett/cid/funcs/func_callerid.c
    team/rmudgett/cid/main/pbx.c

Modified: team/rmudgett/cid/funcs/func_callerid.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/funcs/func_callerid.c?view=diff&rev=272443&r1=272442&r2=272443
==============================================================================
--- team/rmudgett/cid/funcs/func_callerid.c (original)
+++ team/rmudgett/cid/funcs/func_callerid.c Thu Jun 24 15:16:49 2010
@@ -302,22 +302,22 @@
 };
 
 AST_DEFINE_APP_ARGS_TYPE(ast_party_func_args,
-	AST_APP_ARG(member);	/* Member name */
-	AST_APP_ARG(opts);		/* Options token */
-	AST_APP_ARG(other);		/* Any remining unused arguments */
+	AST_APP_ARG(member);	/*!< Member name */
+	AST_APP_ARG(opts);		/*!< Options token */
+	AST_APP_ARG(other);		/*!< Any remining unused arguments */
 	);
 
 AST_DEFINE_APP_ARGS_TYPE(ast_party_members,
-	AST_APP_ARG(subnames[10]);	/* Option member subnames */
+	AST_APP_ARG(subnames[10]);	/*!< Option member subnames */
 	);
 
 enum CONNECTED_LINE_OPT_FLAGS {
 	CONNECTED_LINE_OPT_INHIBIT = (1 << 0),
 };
 enum CONNECTED_LINE_OPT_ARGS {
-	CONNECTED_LINE_OPT_DUMMY,	/* Delete this if CONNECTED_LINE ever gets an option with parameters. */
-
-	/* note: this entry _MUST_ be the last one in the enum */
+	CONNECTED_LINE_OPT_DUMMY,	/*!< Delete this if CONNECTED_LINE ever gets an option with parameters. */
+
+	/*! \note This entry _MUST_ be the last one in the enum */
 	CONNECTED_LINE_OPT_ARG_ARRAY_SIZE
 };
 
@@ -329,9 +329,9 @@
 	REDIRECTING_OPT_INHIBIT = (1 << 0),
 };
 enum REDIRECTING_OPT_ARGS {
-	REDIRECTING_OPT_DUMMY,	/* Delete this if REDIRECTING ever gets an option with parameters. */
-
-	/* note: this entry _MUST_ be the last one in the enum */
+	REDIRECTING_OPT_DUMMY,	/*!< Delete this if REDIRECTING ever gets an option with parameters. */
+
+	/*! \note This entry _MUST_ be the last one in the enum */
 	REDIRECTING_OPT_ARG_ARRAY_SIZE
 };
 
@@ -856,8 +856,8 @@
 	char *parms;
 	struct ast_party_members member;
 	AST_DECLARE_APP_ARGS(args,
-		AST_APP_ARG(member);	/* Member name */
-		AST_APP_ARG(cid);		/* Optional caller id to parse instead of from the channel. */
+		AST_APP_ARG(member);	/*!< Member name */
+		AST_APP_ARG(cid);		/*!< Optional caller id to parse instead of from the channel. */
 		);
 
 	/* Ensure that the buffer is empty */

Modified: team/rmudgett/cid/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/main/pbx.c?view=diff&rev=272443&r1=272442&r2=272443
==============================================================================
--- team/rmudgett/cid/main/pbx.c (original)
+++ team/rmudgett/cid/main/pbx.c Thu Jun 24 15:16:49 2010
@@ -4656,9 +4656,9 @@
 		int timeout = 0;
 
 		/* loop on priorities in this context/exten */
-		while ( !(res = ast_spawn_extension(c, c->context, c->exten, c->priority,
+		while (!(res = ast_spawn_extension(c, c->context, c->exten, c->priority,
 			S_COR(c->caller.id.XXX_number.valid, c->caller.id.XXX_number.str, NULL),
-			&found,1))) {
+			&found, 1))) {
 			if (c->_softhangup == AST_SOFTHANGUP_TIMEOUT
 				&& ast_exists_extension(c, c->context, "T", 1,
 					S_COR(c->caller.id.XXX_number.valid, c->caller.id.XXX_number.str, NULL))) {