xine_xmalloc() deprecation: replace its use with static and non-zero size.

The xine_xmalloc() function is going to be deprecated, as its
behaviour is rarely needed as such, and it's thus misused.

With this, almost all uses of xine_xmalloc() with static size (for
instance the value returned by sizeof()) or with a size that is
guaranteed not to be zero (like strlen()+1) are replaced with calls to
either calloc(1, ...) or malloc().

malloc() is used whenever the allocated memory is going to be
immediately overwritten, while calloc() is used in every other case,
as it sets the whole memory area to zero.

--HG--
extra : transplant_source : %8F%98%EC%02%1E%83%F0s%06X%83C%205Y%80%B12%CC%E1

1 files changed, 2 insertions, 2 deletions

diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c
index 1ac4ed982..2d0ff4d8d 100644
--- a/src/xine-engine/info_helper.c
+++ b/src/xine-engine/info_helper.c
@@ -340,7 +340,7 @@ void _x_meta_info_set_utf8(xine_stream_t *stream, int info, const char *str) {
 void _x_meta_info_n_set(xine_stream_t *stream, int info, const char *buf, int len) {
   pthread_mutex_lock(&stream->meta_mutex);
   if(meta_valid(info) && len) {
-    char *str = xine_xmalloc(len + 1);
+    char *str = malloc(len + 1);
     
     snprintf(str, len + 1 , "%s", buf);
     meta_info_set_unlocked(stream, info, (const char *) &str[0]);
@@ -376,7 +376,7 @@ void _x_meta_info_set_multi(xine_stream_t *stream, int info, ...) {
     if(len) {
       char *p, *meta;
       
-      p = meta = (char *) xine_xmalloc(len + 1);
+      p = meta = (char *) malloc(len + 1);
       
       n = 0;
       while(args[n]) {