[asterisk-commits] oej: branch oej/agave-dtmf-duration-asterisk-conf-1.8 r412024 - in /team/oej/...

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Apr  9 01:35:46 2014
New Revision: 412024

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412024
Log:
Reset, resolve

Modified:
    team/oej/agave-dtmf-duration-asterisk-conf-1.8/   (props changed)
    team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/asterisk.c
    team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/config.c

Propchange: team/oej/agave-dtmf-duration-asterisk-conf-1.8/
------------------------------------------------------------------------------
    automerge = Is-there-life-off-net?

Propchange: team/oej/agave-dtmf-duration-asterisk-conf-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr  9 01:35:46 2014
@@ -1,1 +1,1 @@
-/branches/1.8:1-411828
+/branches/1.8:1-412023

Modified: team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/asterisk.c?view=diff&rev=412024&r1=412023&r2=412024
==============================================================================
--- team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/asterisk.c (original)
+++ team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/asterisk.c Wed Apr  9 01:35:46 2014
@@ -3182,6 +3182,13 @@
 			if (sscanf(v->value, "%30u", &option_dtmfminduration) != 1) {
 				option_dtmfminduration = AST_MIN_DTMF_DURATION;
 			}
+		/* Enable internal timing */
+		} else if (!strcasecmp(v->name, "internal_timing")) {
+			if (!ast_opt_remote) {
+				fprintf(stderr,
+					"NOTICE: The internal_timing option is no longer needed.\n"
+					"  It will always be enabled if you have a timing module loaded.\n");
+			}
 		} else if (!strcasecmp(v->name, "maxcalls")) {
 			if ((sscanf(v->value, "%30d", &option_maxcalls) != 1) || (option_maxcalls < 0)) {
 				option_maxcalls = 0;
@@ -3490,6 +3497,11 @@
 		case 'h':
 			show_cli_help();
 			exit(0);
+		case 'I':
+			fprintf(stderr,
+				"NOTICE: The -I option is no longer needed.\n"
+				"  It will always be enabled if you have a timing module loaded.\n");
+			break;
 		case 'i':
 			ast_set_flag(&ast_options, AST_OPT_FLAG_INIT_KEYS);
 			break;

Modified: team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/config.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/config.c?view=diff&rev=412024&r1=412023&r2=412024
==============================================================================
--- team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/config.c (original)
+++ team/oej/agave-dtmf-duration-asterisk-conf-1.8/main/config.c Wed Apr  9 01:35:46 2014
@@ -122,8 +122,10 @@
 static void  CB_ADD_LEN(struct ast_str **cb, const char *str, int len)
 {
 	char *s = ast_alloca(len + 1);
-	ast_copy_string(s, str, len);
-	ast_str_append(cb, 0, "%s", str);
+
+	memcpy(s, str, len);
+	s[len] = '\0';
+	ast_str_append(cb, 0, "%s", s);
 }
 
 static void CB_RESET(struct ast_str *cb, struct ast_str *llb)  
@@ -1648,7 +1650,7 @@
 					} else if ((comment_p >= new_buf + 2) &&
 						   (*(comment_p - 1) == COMMENT_TAG) &&
 						   (*(comment_p - 2) == COMMENT_TAG)) {
-						/* Meta-Comment end detected */
+						/* Meta-Comment end detected "--;" */
 						comment--;
 						new_buf = comment_p + 1;
 						if (!comment) {