summaryrefslogtreecommitdiff
path: root/src/input/input_http.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-05-07 17:11:22 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-05-07 17:11:22 +0200
commit4527fd438b39dc312c69839f051e0a2ac0046356 (patch)
treed3b2dc1f89617e86c619575e3324534c523ed673 /src/input/input_http.c
parent47c1651eb8c42ab6dddaff7c0663c45ac49b4fcf (diff)
parent88d23a2dbabf419ab4014b449be119a741aa54f5 (diff)
downloadxine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.gz
xine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.bz2
Merge file removal.
Diffstat (limited to 'src/input/input_http.c')
-rw-r--r--src/input/input_http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/input_http.c b/src/input/input_http.c
index af696ca14..93198a06e 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -1022,7 +1022,7 @@ static input_plugin_t *http_class_get_instance (input_class_t *cls_gen, xine_str
strncasecmp (mrl, "peercast://pls/", 15)) {
return NULL;
}
- this = (http_input_plugin_t *) xine_xmalloc(sizeof(http_input_plugin_t));
+ this = calloc(1, sizeof(http_input_plugin_t));
if (!strncasecmp (mrl, "peercast://pls/", 15)) {
this->mrl = xine_xmalloc (30 + strlen(mrl) - 15);
@@ -1073,7 +1073,7 @@ static void *init_class (xine_t *xine, void *data) {
config_values_t *config;
char *proxy_env;
- this = (http_input_class_t *) xine_xmalloc (sizeof (http_input_class_t));
+ this = calloc(1, sizeof (http_input_class_t));
this->xine = xine;
this->config = xine->config;