From ed1607f9cc979cbaa065bd0ac810368b49920af8 Mon Sep 17 00:00:00 2001 From: murf Date: Tue, 2 Jan 2007 22:43:36 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/trunk@49238 f38db490-d61c-443f-a65b-d21fe96a405b --- main/ast_expr2f.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/ast_expr2f.c') diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c index 3fec4a216..b0e69450f 100644 --- a/main/ast_expr2f.c +++ b/main/ast_expr2f.c @@ -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); } -- cgit v1.2.3