[asterisk-commits] seanbright: branch seanbright/editline-update r253111 - in /team/seanbright/e...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Mar 17 08:36:06 CDT 2010 

Author: seanbright
Date: Wed Mar 17 08:36:02 2010
New Revision: 253111

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253111
Log:
Merged revisions 252976,252980,253004,253028,253032 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r252976 | tilghman | 2010-03-16 19:49:35 -0400 (Tue, 16 Mar 2010) | 8 lines
  
  Mask out previous arguments on each nested invocation of Gosub.
  (closes issue #16758)
   Reported by: wdoekes
   Patches: 
         20100316__issue16758.diff.txt uploaded by tilghman (license 14)
   
  Review: https://reviewboard.asterisk.org/r/561/
................
  r252980 | tilghman | 2010-03-16 20:14:29 -0400 (Tue, 16 Mar 2010) | 2 lines
  
  Fix bamboo compile error by calculating an integer with the same size as a pointer.
................
  r253004 | tilghman | 2010-03-16 20:23:12 -0400 (Tue, 16 Mar 2010) | 2 lines
  
  Argh.
................
  r253028 | lmadsen | 2010-03-16 20:29:06 -0400 (Tue, 16 Mar 2010) | 13 lines
  
  Merged revisions 253018 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r253018 | lmadsen | 2010-03-16 19:26:19 -0500 (Tue, 16 Mar 2010) | 6 lines
    
    Add french snipset to say.conf.
    
    Add the french snipset to say.conf.
    
    (Closes issue #15799)
  ........
................
  r253032 | lmadsen | 2010-03-16 20:40:51 -0400 (Tue, 16 Mar 2010) | 1 line
  
  Fix a typo.
................

Added:
    team/seanbright/editline-update/tests/test_gosub.c
      - copied unchanged from r253032, trunk/tests/test_gosub.c
Modified:
    team/seanbright/editline-update/   (props changed)
    team/seanbright/editline-update/apps/app_stack.c
    team/seanbright/editline-update/configs/say.conf.sample
    team/seanbright/editline-update/configure
    team/seanbright/editline-update/configure.ac
    team/seanbright/editline-update/include/asterisk/autoconfig.h.in
    team/seanbright/editline-update/main/xmldoc.c

Propchange: team/seanbright/editline-update/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 17 08:36:02 2010
@@ -1,1 +1,1 @@
-/trunk:1-252917
+/trunk:1-253110

Modified: team/seanbright/editline-update/apps/app_stack.c
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/apps/app_stack.c?view=diff&rev=253111&r1=253110&r2=253111
==============================================================================
--- team/seanbright/editline-update/apps/app_stack.c (original)
+++ team/seanbright/editline-update/apps/app_stack.c Wed Mar 17 08:36:02 2010
@@ -344,9 +344,9 @@
 {
 	struct ast_datastore *stack_store = ast_channel_datastore_find(chan, &stack_info, NULL);
 	AST_LIST_HEAD(, gosub_stack_frame) *oldlist;
-	struct gosub_stack_frame *newframe;
+	struct gosub_stack_frame *newframe, *lastframe;
 	char argname[15], *tmp = ast_strdupa(data), *label, *endparen;
-	int i;
+	int i, max_argc = 0;
 	AST_DECLARE_APP_ARGS(args2,
 		AST_APP_ARG(argval)[100];
 	);
@@ -374,6 +374,12 @@
 		stack_store->data = oldlist;
 		AST_LIST_HEAD_INIT(oldlist);
 		ast_channel_datastore_add(chan, stack_store);
+	} else {
+		oldlist = stack_store->data;
+	}
+
+	if ((lastframe = AST_LIST_FIRST(oldlist))) {
+		max_argc = lastframe->arguments;
 	}
 
 	/* Separate the arguments from the label */
@@ -389,8 +395,13 @@
 	} else
 		args2.argc = 0;
 
+	/* Mask out previous arguments in this invocation */
+	if (args2.argc > max_argc) {
+		max_argc = args2.argc;
+	}
+
 	/* Create the return address, but don't save it until we know that the Gosub destination exists */
-	newframe = gosub_allocate_frame(chan->context, chan->exten, chan->priority + 1, args2.argc);
+	newframe = gosub_allocate_frame(chan->context, chan->exten, chan->priority + 1, max_argc);
 
 	if (!newframe) {
 		return -1;
@@ -413,10 +424,10 @@
 	}
 
 	/* Now that we know for certain that we're going to a new location, set our arguments */
-	for (i = 0; i < args2.argc; i++) {
+	for (i = 0; i < max_argc; i++) {
 		snprintf(argname, sizeof(argname), "ARG%d", i + 1);
-		frame_set_var(chan, newframe, argname, args2.argval[i]);
-		ast_debug(1, "Setting '%s' to '%s'\n", argname, args2.argval[i]);
+		frame_set_var(chan, newframe, argname, i < args2.argc ? args2.argval[i] : "");
+		ast_debug(1, "Setting '%s' to '%s'\n", argname, i < args2.argc ? args2.argval[i] : "");
 	}
 	snprintf(argname, sizeof(argname), "%d", args2.argc);
 	frame_set_var(chan, newframe, "ARGC", argname);

Modified: team/seanbright/editline-update/configs/say.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/configs/say.conf.sample?view=diff&rev=253111&r1=253110&r2=253111
==============================================================================
--- team/seanbright/editline-update/configs/say.conf.sample (original)
+++ team/seanbright/editline-update/configs/say.conf.sample Wed Mar 17 08:36:02 2010
@@ -198,3 +198,35 @@
     _datetime::. => date:YBdA k 'ora' M 'perc':${SAY}
     _date::. => date:YBdA:${SAY}
     _time::. => date:k 'ora' M 'perc':${SAY}
+
+[fr](date-base,digit-base)
+    _[n]um:0. => num:${SAY:1}
+    _[n]um:X => digits/${SAY}
+    _[n]um:1X => digits/${SAY}
+    _[n]um:[2-9]0 =>  digits/${SAY}
+    _[n]um:[2-6]1 => digits/${SAY:0:1}0, vm-and, digits/${SAY:1}
+    _[n]um:71 => digits/60, vm-and, num:1${SAY:1}
+    _[n]um:7X => digits/60, num:1${SAY:1}
+    _[n]um:9X => digits/80, num:1${SAY:1}
+    _[n]um:[2-9][1-9] =>  digits/${SAY:0:1}0, num:${SAY:1}
+    _[n]um:100 => digits/hundred
+    _[n]um:1XX => digits/hundred, num:${SAY:1}
+    _[n]um:[2-9]XX => num:${SAY:0:1}, digits/hundred, num:${SAY:1}
+    
+    _[n]um:1XXX => digits/thousand, num:${SAY:1}
+    _[n]um:[2-9]XXX => num:${SAY:0:1}, digits/thousand, num:${SAY:1}
+    _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2}
+    _[n]um:XXXXXX => num:${SAY:0:3}, digits/thousand, num:${SAY:3}
+    
+    _[n]um:1XXXXXX => num:${SAY:0:1}, digits/million, num:${SAY:1}
+    _[n]um:[2-9]XXXXXX => num:${SAY:0:1}, digits/million, num:${SAY:1}
+    _[n]um:XXXXXXXX => num:${SAY:0:2}, digits/million, num:${SAY:2}
+    _[n]um:XXXXXXXXX => num:${SAY:0:3}, digits/million, num:${SAY:3}
+    
+    _datetime::. => date:AdBY 'digits/at' H 'hours' M 'perc':${SAY}  
+    _date::. => date:AdBY:${SAY}
+    _time::. => date:H 'hours' M 'perc':${SAY}
+    
+    _pho[n]e:XXXX => num:${SAY:0:2}, num:${SAY:2:2}
+    _pho[n]e:0[1-9]XXXXXXXX => num:${SAY:0:1}, num:${SAY:1:1}, num:${SAY:2:2}, num:${SAY:4:2}, num:${SAY:6:2}, num:${SAY:8:2}
+    _pho[n]e:. => digit:${SAY}

Modified: team/seanbright/editline-update/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/configure.ac?view=diff&rev=253111&r1=253110&r2=253111
==============================================================================
--- team/seanbright/editline-update/configure.ac (original)
+++ team/seanbright/editline-update/configure.ac Wed Mar 17 08:36:02 2010
@@ -781,7 +781,10 @@
 AC_CHECK_HEADER([libkern/OSAtomic.h],
                 [AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
 
-AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF([int])
+AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([long long])
+AC_CHECK_SIZEOF([char *])
 
 # do the package library checks now
 

Modified: team/seanbright/editline-update/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/include/asterisk/autoconfig.h.in?view=diff&rev=253111&r1=253110&r2=253111
==============================================================================
--- team/seanbright/editline-update/include/asterisk/autoconfig.h.in (original)
+++ team/seanbright/editline-update/include/asterisk/autoconfig.h.in Wed Mar 17 08:36:02 2010
@@ -1317,8 +1317,17 @@
    release 3. */
 #undef SETVBUF_REVERSED
 
+/* The size of `char *', as computed by sizeof. */
+#undef SIZEOF_CHAR_P
+
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be

Modified: team/seanbright/editline-update/main/xmldoc.c
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/main/xmldoc.c?view=diff&rev=253111&r1=253110&r2=253111
==============================================================================
--- team/seanbright/editline-update/main/xmldoc.c (original)
+++ team/seanbright/editline-update/main/xmldoc.c Wed Mar 17 08:36:02 2010
@@ -1786,7 +1786,7 @@
 	node = xmldoc_get_node(type, name, documentation_language);
 
 	if (!node) {
-		ast_log(LOG_WARNING, "Counldn't find %s %s in XML documentation\n", type, name);
+		ast_log(LOG_WARNING, "Couldn't find %s %s in XML documentation\n", type, name);
 		return ret;
 	}

More information about the asterisk-commits mailing list