diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-23 12:37:58 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-23 12:37:58 +0000 |
| commit | fc4a1f4179e6ba011618647df31fed05be415654 (patch) | |
| tree | 7c9f72080b71e1183e5065cf6ec16e5a0bbc8f4e /main/utils.c | |
| parent | 3e7f8750f1c22da79cf7ede176935b1d448b675a (diff) | |
Merged revisions 118049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r118049 | russell | 2008-05-23 07:37:31 -0500 (Fri, 23 May 2008) | 17 lines
Merged revisions 118048 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r118048 | russell | 2008-05-23 07:30:53 -0500 (Fri, 23 May 2008) | 9 lines
Don't declare a function that takes variable arguments as inline, because it's
not valid, and on some compilers, will emit a warning.
http://gcc.gnu.org/onlinedocs/gcc/Inline.html#Inline
(closes issue #12289)
Reported by: francesco_r
Patches by Tilghman, final patch by me
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@118050 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/utils.c')
| -rw-r--r-- | main/utils.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/main/utils.c b/main/utils.c index bfd13d41c..b08296263 100644 --- a/main/utils.c +++ b/main/utils.c @@ -1576,3 +1576,19 @@ int ast_utils_init(void) #endif return 0; } + +#ifndef __AST_DEBUG_MALLOC +int _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...) +{ + int res; + va_list ap; + + va_start(ap, fmt); + if ((res = vasprintf(ret, fmt, ap)) == -1) { + MALLOC_FAILURE_MSG; + } + va_end(ap); + + return res; +} +#endif |