[asterisk-commits] rmudgett: trunk r311875 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Mar 29 20:57:00 2011
New Revision: 311875

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311875
Log:
Merged revisions 311874 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r311874 | rmudgett | 2011-03-29 20:56:05 -0500 (Tue, 29 Mar 2011) | 1 line
  
  Update some setup_dahdi_int() comments.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=311875&r1=311874&r2=311875
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Tue Mar 29 20:57:00 2011
@@ -17824,7 +17824,8 @@
  * \brief Setup DAHDI channel driver.
  *
  * \param reload enum: load_module(0), reload(1), restart(2).
- * \param base_conf Default config parameters.  So cc_params can be properly destroyed.
+ * \param default_conf Default config parameters.  So cc_params can be properly destroyed.
+ * \param base_conf Default config parameters per section.  So cc_params can be properly destroyed.
  * \param conf Local config parameters.  So cc_params can be properly destroyed.
  *
  * \retval 0 on success.
@@ -17988,7 +17989,7 @@
 	if (ucfg) {
 		const char *chans;
 
-		/* Reset base_conf, so things dont leak from dahdi_chan.conf */
+		/* Reset base_conf, so things don't leak from dahdi_chan.conf */
 		deep_copy_dahdi_chan_conf(base_conf, default_conf);
 		process_dahdi(base_conf, "", ast_variable_browse(ucfg, "general"), 1, 0);