first phase of proper fix for portable string function problems (bug #4669)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-07-15 00:39:01 +00:00
parent dcfabce0e4
commit b6486df40e
4 changed files with 35 additions and 13 deletions

View File

@@ -31,12 +31,6 @@
#error "You need newer zaptel! Please cvs update zaptel"
#endif
#endif
#ifdef __FreeBSD__
#include <strfunc.h>
#if (!defined(__STRFUNC_H__) && (!defined(STRFUNC_H)))
#error "Please install the strfunc library located in the ports collection at /usr/ports/devel/libstrfunc"
#endif
#endif
#include "asterisk.h"
@@ -1759,8 +1753,8 @@ char *ast_recvtext(struct ast_channel *chan, int timeout)
break; /* no frame */
if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HANGUP)
done = 1; /* force a break */
else if (f->frametype == AST_FRAME_TEXT) { /* what we want */
buf = strndup((char *)f->data, f->datalen); /* dup and break */
else if (f->frametype == AST_FRAME_TEXT) { /* what we want */
buf = ast_strndup((char *) f->data, f->datalen); /* dup and break */
done = 1;
}
ast_frfree(f);