diff options
| author | Steve Murphy <murf@digium.com> | 2007-01-02 22:43:36 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-01-02 22:43:36 +0000 |
| commit | 7c6b71df21b62a3fc512b7ef76af21e08724b025 (patch) | |
| tree | 766d08251e00e59388f6a24adb96376a173a7516 /main/ast_expr2.fl | |
| parent | f7ee0abcd26d6888571a7905b7da14623bdc6bef (diff) | |
Merged revisions 49237 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49237 | murf | 2007-01-02 15:30:53 -0700 (Tue, 02 Jan 2007) | 1 line
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49238 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/ast_expr2.fl')
| -rw-r--r-- | main/ast_expr2.fl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index 58c522883..8f156e81f 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -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); } |