# HG changeset patch # User cboesch # Date 1292768344 0 # Node ID 146fb095863070c2080fc1dd034fbf1f724e52c0 # Parent b05c02525cb18770fc3e04312cd8e4e8c3cb440b Replace two malloc+memset with calloc. diff -r b05c02525cb1 -r 146fb0958630 stream/http.c --- a/stream/http.c Sun Dec 19 14:15:44 2010 +0000 +++ b/stream/http.c Sun Dec 19 14:19:04 2010 +0000 @@ -298,9 +298,8 @@ http_new_header(void) { HTTP_header_t *http_hdr; - http_hdr = malloc(sizeof(HTTP_header_t)); + http_hdr = calloc(1, sizeof(*http_hdr)); if( http_hdr==NULL ) return NULL; - memset( http_hdr, 0, sizeof(HTTP_header_t) ); return http_hdr; } diff -r b05c02525cb1 -r 146fb0958630 stream/url.c --- a/stream/url.c Sun Dec 19 14:15:44 2010 +0000 +++ b/stream/url.c Sun Dec 19 14:19:04 2010 +0000 @@ -102,15 +102,12 @@ } // Create the URL container - Curl = malloc(sizeof(URL_t)); + Curl = calloc(1, sizeof(*Curl)); if( Curl==NULL ) { mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); goto err_out; } - // Initialisation of the URL container members - memset( Curl, 0, sizeof(URL_t) ); - url_escape_string(escfilename,url); // Copy the url in the URL container