mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-04 05:15:22 +00:00 
			
		
		
		
	Merged revisions 59206 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r59206 | murf | 2007-03-26 11:38:29 -0600 (Mon, 26 Mar 2007) | 1 line A fix for the flex input files, DONT_COMPILE, and STANDALONE_AEL ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		@@ -241,7 +241,7 @@ int ast_expr(char *expr, char *buf, int length)
 | 
			
		||||
			res_length = snprintf(buf, length, "%ld", (long int) io.val->u.i);
 | 
			
		||||
			return_value = (res_length <= length) ? res_length : length;
 | 
			
		||||
		} else {
 | 
			
		||||
#if defined(STANDALONE) || defined(LOW_MEMORY)
 | 
			
		||||
#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
 | 
			
		||||
			strncpy(buf, io.val->u.s, length - 1);
 | 
			
		||||
#else /* !STANDALONE && !LOW_MEMORY */
 | 
			
		||||
			ast_copy_string(buf, io.val->u.s, length);
 | 
			
		||||
 
 | 
			
		||||
@@ -3122,7 +3122,7 @@ int ast_expr(char *expr, char *buf, int length)
 | 
			
		||||
			res_length = snprintf(buf, length, "%ld", (long int) io.val->u.i);
 | 
			
		||||
			return_value = (res_length <= length) ? res_length : length;
 | 
			
		||||
		} else {
 | 
			
		||||
#if defined(STANDALONE) || defined(LOW_MEMORY)
 | 
			
		||||
#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
 | 
			
		||||
			strncpy(buf, io.val->u.s, length - 1);
 | 
			
		||||
#else /* !STANDALONE && !LOW_MEMORY */
 | 
			
		||||
			ast_copy_string(buf, io.val->u.s, length);
 | 
			
		||||
 
 | 
			
		||||
@@ -411,7 +411,7 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 | 
			
		||||
			if (*(p1+1) != '/')
 | 
			
		||||
				snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, p1 + 1);
 | 
			
		||||
			else
 | 
			
		||||
#if defined(STANDALONE) || defined(LOW_MEMORY)
 | 
			
		||||
#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
 | 
			
		||||
				strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
 | 
			
		||||
#else
 | 
			
		||||
				ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user