Merged revisions 145293,158010 from

https://origsvn.digium.com/svn/asterisk/branches/1.4
to make merging easier.  These changes are already on trunk.

................
  r145293 | rmudgett | 2008-09-30 18:55:24 -0500 (Tue, 30 Sep 2008) | 54 lines

  channels/chan_misdn.c
  channels/misdn/isdn_lib.c
  *  Miscellaneous other fixes from trunk to make merging easier later.

  ........
  r145200 | rmudgett | 2008-09-30 16:00:54 -0500 (Tue, 30 Sep 2008) | 7 lines

  *  Miscellaneous formatting changes to make v1.4 and trunk
  more merge compatible in the mISDN area.

  channels/chan_misdn.c
  *  Eliminated redundant code in cb_events() EVENT_SETUP

  ........
  r144257 | crichter | 2008-09-24 03:42:55 -0500 (Wed, 24 Sep 2008) | 9 lines

  improved helptext of misdn_set_opt.
  ........
  r142181 | rmudgett | 2008-09-09 12:30:52 -0500 (Tue, 09 Sep 2008) | 1 line

  Cleaned up comment

  ........
  r138738 | rmudgett | 2008-08-18 16:07:28 -0500 (Mon, 18 Aug 2008) | 30 lines

  channels/chan_misdn.c
  *  Made bearer2str() use allowed_bearers_array[]
  *  Made use the causes.h defines instead of hardcoded numbers.
  *  Made use Asterisk presentation indicator values if either of the
  mISDN presentation or screen options are negative.
  *  Updated the misdn_set_opt application option descriptions.
  *  Renamed the awkward Caller ID presentation misdn_set_opt
  application option value not_screened to restricted.
  Deprecated the not_screened option value.

  channels/misdn/isdn_lib.c
  *  Made use the causes.h defines instead of hardcoded numbers.
  *  Fixed some spelling errors and typos.
  *  Added all defined facility code strings to fac2str().

  channels/misdn/isdn_lib.h
  *  Added doxygen comments to struct misdn_bchannel.

  channels/misdn/isdn_lib_intern.h
  *  Added doxygen comments to struct misdn_stack.

  channels/misdn_config.c
  configs/misdn.conf.sample
  *  Updated the mISDN presentation and screen parameter descriptions.

  doc/misdn.txt (doc/tex/misdn.tex)
  *  Updated the misdn_set_opt application option descriptions.
  *  Fixed some spelling errors and typos.
................
  r158010 | rmudgett | 2008-11-19 19:46:09 -0600 (Wed, 19 Nov 2008) | 9 lines

  Merged revision 157977 from
  https://origsvn.digium.com/svn/asterisk/team/group/issue8824

  ........
  Fixes JIRA ABE-1726

  The dial extension could be empty if you are using MISDN_KEYPAD
  to control ISDN provider features.
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@207286 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 9 insertions, 9 deletions

diff --git a/main/callerid.c b/main/callerid.c
index a67b1c694..f14eeea79 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -969,15 +969,15 @@ int ast_is_shrinkable_phonenumber(const char *exten)
 	return ast_is_valid_string(exten, "0123456789*#+()-.");
 }
 
-/*! \brief parse string for caller id information 
-	\return always returns 0, as the code always returns something.
-  XXX note that 'name' is not parsed consistently e.g. we have
-
-	input			location	name
-	" foo bar " <123>	123		' foo bar ' (with spaces around)
-	" foo bar "		NULL		'foo bar' (without spaces around)
-  The parsing of leading and trailing space/quotes should be more consistent.
-*/
+/*!
+ * \brief Destructively parse instr for caller id information 
+ * \return always returns 0, as the code always returns something.
+ * \note XXX 'name' is not parsed consistently e.g. we have
+ * input                   location        name
+ * " foo bar " <123>       123             ' foo bar ' (with spaces around)
+ * " foo bar "             NULL            'foo bar' (without spaces around)
+ * The parsing of leading and trailing space/quotes should be more consistent.
+ */
 int ast_callerid_parse(char *instr, char **name, char **location)
 {
 	char *ns, *ne, *ls, *le;