convert malloc+memset to ast_calloc
authorRussell Bryant <russell@russellbryant.com>
Sat, 18 Mar 2006 18:55:35 +0000 (18:55 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 18 Mar 2006 18:55:35 +0000 (18:55 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13423 65c4cc65-6c06-0410-ace0-fbb531ad65f3

rtp.c

diff --git a/rtp.c b/rtp.c
index 8437e43..1437c55 100644 (file)
--- a/rtp.c
+++ b/rtp.c
@@ -982,10 +982,9 @@ static int rtp_socket(void)
 static struct ast_rtcp *ast_rtcp_new(void)
 {
        struct ast_rtcp *rtcp;
-       rtcp = malloc(sizeof(struct ast_rtcp));
-       if (!rtcp)
+
+       if (!(rtcp = ast_calloc(1, sizeof(*rtcp))))
                return NULL;
-       memset(rtcp, 0, sizeof(struct ast_rtcp));
        rtcp->s = rtp_socket();
        rtcp->us.sin_family = AF_INET;
        if (rtcp->s < 0) {
@@ -993,6 +992,7 @@ static struct ast_rtcp *ast_rtcp_new(void)
                ast_log(LOG_WARNING, "Unable to allocate socket: %s\n", strerror(errno));
                return NULL;
        }
+
        return rtcp;
 }
 
@@ -1002,10 +1002,9 @@ struct ast_rtp *ast_rtp_new_with_bindaddr(struct sched_context *sched, struct io
        int x;
        int first;
        int startplace;
-       rtp = malloc(sizeof(struct ast_rtp));
-       if (!rtp)
+       
+       if (!(rtp = ast_calloc(1, sizeof(*rtp))))
                return NULL;
-       memset(rtp, 0, sizeof(struct ast_rtp));
        rtp->them.sin_family = AF_INET;
        rtp->us.sin_family = AF_INET;
        rtp->s = rtp_socket();