kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

This is a slight modification to Josh's edits for #8579; both files edited were the produced by flex; so the source files need to be changed instead, and the generated files regenerated.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-01-02 22:30:53 +00:00
parent 5edb7fa173
commit 49cce60e51
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/ast_expr2.fl
View File

@@ -241,11 +241,11 @@ 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 {
#ifdef STANDALONE
#if defined(STANDALONE) || defined(LOW_MEMORY)
strncpy(buf, io.val->u.s, length - 1);
#else /* !STANDALONE */
#else /* !STANDALONE && !LOW_MEMORY */
ast_copy_string(buf, io.val->u.s, length);
#endif /* STANDALONE */
#endif /* STANDALONE || LOW_MEMORY */
return_value = strlen(buf);
free(io.val->u.s);
}

6
main/ast_expr2f.c
View File

@@ -3122,11 +3122,11 @@ 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 {
#ifdef STANDALONE
#if defined(STANDALONE) || defined(LOW_MEMORY)
strncpy(buf, io.val->u.s, length - 1);
#else /* !STANDALONE */
#else /* !STANDALONE && !LOW_MEMORY */
ast_copy_string(buf, io.val->u.s, length);
#endif /* STANDALONE */
#endif /* STANDALONE || LOW_MEMORY */
return_value = strlen(buf);
free(io.val->u.s);
}

2
pbx/ael/ael.flex
View File

@@ -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
#ifdef STANDALONE
#if defined(STANDALONE) || defined(LOW_MEMORY)
strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
#else
ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));

2
pbx/ael/ael_lex.c
View File

@@ -1683,7 +1683,7 @@ YY_RULE_SETUP
if (*(p1+1) != '/')
snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, p1 + 1);
else
#ifdef STANDALONE
#if defined(STANDALONE) || defined(LOW_MEMORY)
strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
#else
ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));