mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 20:56:39 +00:00
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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user