From 44cc01b79d3fe53ae18467604feaadaaee4591af Mon Sep 17 00:00:00 2001 From: rmudgett Date: Wed, 30 Mar 2011 01:57:00 +0000 Subject: [PATCH] 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. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@311875 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_dahdi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b59e157a5..39ecbfed6 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -17824,7 +17824,8 @@ static void deep_copy_dahdi_chan_conf(struct dahdi_chan_conf *dest, const struct * \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 @@ static int setup_dahdi_int(int reload, struct dahdi_chan_conf *default_conf, str 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);