Mercurial > mplayer.hg
comparison stream/stream.c @ 29887:195deae202cb
Merge malloc+memset -> calloc
author | reimar |
---|---|
date | Tue, 17 Nov 2009 19:14:42 +0000 |
parents | 9112683a9a02 |
children | 4f740437ed2b |
comparison
equal
deleted
inserted
replaced
29886:988c42cb595a | 29887:195deae202cb |
---|---|
394 stream_t* new_memory_stream(unsigned char* data,int len){ | 394 stream_t* new_memory_stream(unsigned char* data,int len){ |
395 stream_t *s; | 395 stream_t *s; |
396 | 396 |
397 if(len < 0) | 397 if(len < 0) |
398 return NULL; | 398 return NULL; |
399 s=malloc(sizeof(stream_t)+len); | 399 s=calloc(1, sizeof(stream_t)+len); |
400 memset(s,0,sizeof(stream_t)); | |
401 s->fd=-1; | 400 s->fd=-1; |
402 s->type=STREAMTYPE_MEMORY; | 401 s->type=STREAMTYPE_MEMORY; |
403 s->buf_pos=0; s->buf_len=len; | 402 s->buf_pos=0; s->buf_len=len; |
404 s->start_pos=0; s->end_pos=len; | 403 s->start_pos=0; s->end_pos=len; |
405 stream_reset(s); | 404 stream_reset(s); |
407 memcpy(s->buffer,data,len); | 406 memcpy(s->buffer,data,len); |
408 return s; | 407 return s; |
409 } | 408 } |
410 | 409 |
411 stream_t* new_stream(int fd,int type){ | 410 stream_t* new_stream(int fd,int type){ |
412 stream_t *s=malloc(sizeof(stream_t)); | 411 stream_t *s=calloc(1, sizeof(stream_t)); |
413 if(s==NULL) return NULL; | 412 if(s==NULL) return NULL; |
414 memset(s,0,sizeof(stream_t)); | |
415 | 413 |
416 #if HAVE_WINSOCK2_H | 414 #if HAVE_WINSOCK2_H |
417 { | 415 { |
418 WSADATA wsdata; | 416 WSADATA wsdata; |
419 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) | 417 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) |