[svn-commits] mmichelson: branch 12 r402687 - in /branches/12: ./ apps/app_confbridge.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Nov 11 13:26:48 2013
New Revision: 402687

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402687
Log:
Get rid of some inaccurate comments.

I'm doing some unrelated work in app_confbridge and finding
these "invalid pin" comments to be annoying. Get out!
........

Merged revisions 402686 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/apps/app_confbridge.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/apps/app_confbridge.c?view=diff&rev=402687&r1=402686&r2=402687
==============================================================================
--- branches/12/apps/app_confbridge.c (original)
+++ branches/12/apps/app_confbridge.c Mon Nov 11 13:26:48 2013
@@ -1555,7 +1555,7 @@
 
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "%s requires an argument (conference name[,options])\n", app);
-		res = -1; /* invalid PIN */
+		res = -1;
 		goto confbridge_cleanup;
 	}
 
@@ -1606,7 +1606,7 @@
 		if (conf_set_menu_to_user(user.menu_name, &user)) {
 			ast_log(LOG_WARNING, "Conference menu %s does not exist and can not be applied to confbridge user.\n",
 				args.menu_name);
-			res = -1; /* invalid PIN */
+			res = -1;
 			goto confbridge_cleanup;
 		}
 	}
@@ -1631,7 +1631,7 @@
 		char *conf_name = ast_strdup(args.conf_name); /* this is freed during feature cleanup */
 
 		if (!conf_name) {
-			res = -1; /* invalid PIN */
+			res = -1;
 			goto confbridge_cleanup;
 		}
 		if (ast_bridge_talk_detector_hook(&user.features, conf_handle_talker_cb,
@@ -1644,7 +1644,7 @@
 
 	/* Look for a conference bridge matching the provided name */
 	if (!(conference = join_conference_bridge(args.conf_name, &user))) {
-		res = -1; /* invalid PIN */
+		res = -1;
 		goto confbridge_cleanup;
 	}