diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-17 19:14:42 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-17 19:14:42 +0000 |
| commit | a81e043f98d79f1e0a47210a0f82062e8b5dbcca (patch) | |
| tree | 1670bd901c722759c45ede53b0d08c035d58c5c3 /stream | |
| parent | 450d40d4434de9f886c00b33a8b3059d528d0558 (diff) | |
| download | mpv-a81e043f98d79f1e0a47210a0f82062e8b5dbcca.tar.bz2 mpv-a81e043f98d79f1e0a47210a0f82062e8b5dbcca.tar.xz | |
Merge malloc+memset -> calloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29929 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/stream/stream.c b/stream/stream.c index 4ee7f8b316..072e9d0a89 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -396,8 +396,7 @@ stream_t* new_memory_stream(unsigned char* data,int len){ if(len < 0) return NULL; - s=malloc(sizeof(stream_t)+len); - memset(s,0,sizeof(stream_t)); + s=calloc(1, sizeof(stream_t)+len); s->fd=-1; s->type=STREAMTYPE_MEMORY; s->buf_pos=0; s->buf_len=len; @@ -409,9 +408,8 @@ stream_t* new_memory_stream(unsigned char* data,int len){ } stream_t* new_stream(int fd,int type){ - stream_t *s=malloc(sizeof(stream_t)); + stream_t *s=calloc(1, sizeof(stream_t)); if(s==NULL) return NULL; - memset(s,0,sizeof(stream_t)); #if HAVE_WINSOCK2_H { |