4 files changed, 7 insertions, 8 deletions
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c
index 51ed5b39d..c116d407f 100644
--- a/src/xine-engine/demux.c
+++ b/src/xine-engine/demux.c
@@ -657,7 +657,7 @@ void _x_demux_send_mrl_reference (xine_stream_t *stream, int alternative,
     xine_mrl_reference_data_ext_t *e;
     xine_mrl_reference_data_t *b;
   } data;
-  int mrl_len = strlen (mrl);
+  const size_t mrl_len = strlen (mrl);
 
   if (!title)
     title = "";
diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c
index e6d4df7e9..242805915 100644
--- a/src/xine-engine/info_helper.c
+++ b/src/xine-engine/info_helper.c
@@ -131,7 +131,7 @@ uint32_t _x_stream_info_get_public(xine_stream_t *stream, int info) {
  * at the end of the string
  */
 static void meta_info_chomp(char *str) {
-  int i, len;
+  size_t i, len;
 
   len = strlen(str);
   if (!len)
@@ -358,7 +358,7 @@ void _x_meta_info_set_multi(xine_stream_t *stream, int info, ...) {
     va_list   ap;
     char     *args[1025];
     char     *buf;
-    int       n, len;
+    size_t    n, len;
     
     len = n = 0;
 
diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index 200721dca..8db7eaaf5 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -517,10 +517,9 @@ static void rip_plugin_dispose(input_plugin_t *this_gen) {
  * returns non-zero, if there was enough space
  */
 static int dir_file_concat(char *target, size_t maxlen, const char *dir, const char *name) {
-  size_t len_dir, len_name, pos_name = 0;
-
-  len_name = strlen(name);
-  len_dir = strlen(dir);
+  size_t len_name = strlen(name);
+  size_t len_dir = strlen(dir);
+  size_t pos_name = 0;
 
   /* remove slashes */
   if (dir[len_dir - 1] == '/') len_dir--;
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 597608883..415ceec56 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -945,7 +945,7 @@ int _x_message(xine_stream_t *stream, int type, ...) {
   xine_ui_message_data_t *data;
   xine_event_t            event;
   const char              *explanation;
-  int                     size;
+  size_t                  size;
   int                     n;
   va_list                 ap;
   char                   *s, *params;