From 16a41a85516f6055918887938e9dd3f3f9fbcf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Fri, 9 May 2008 21:54:58 +0200
Subject: Use size_t to keep the value returned by strlen().

When using a variable to store the result of strlen(), make sure its
type is size_t just like the function returns, rather than using a
smaller type like int.

--HG--
extra : transplant_source : %B0%D5%3B%D7%1Dy%0A%7E%7D%7C%023%08%B2%CE%D3t%0B3%D7
---
 src/input/input_dvb.c    | 2 +-
 src/input/libreal/real.c | 2 +-
 src/input/mms.c          | 6 ++----
 src/input/mmsh.c         | 4 +---
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 9166a80a6..69a413bac 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -1659,7 +1659,7 @@ static void render_text_area(osd_renderer_t* renderer, osd_object_t* osd, char*
   /* The line to be printed next. */
   char text_line[512];
   int text_width, text_height;
-  int old_line_length, line_cursor;
+  size_t old_line_length, line_cursor;
   char* bound, *old_bound;
   
   *height = 0;
diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index dc3f00105..f4698a4fb 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -313,7 +313,7 @@ static void calc_response_string (char *result, char *challenge) {
 
 void real_calc_response_and_checksum (char *response, char *chksum, char *challenge) {
 
-  int   ch_len, resp_len;
+  size_t ch_len, resp_len;
   int   i;
   char *ptr;
   char  buf[128];
diff --git a/src/input/mms.c b/src/input/mms.c
index 97a05dd89..ab1983955 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -771,12 +771,10 @@ mms_t *mms_connect (xine_stream_t *stream, const char *url, int bandwidth) {
   /* command 0x5 */
   {
     mms_buffer_t command_buffer;
-    char *path;
-    int pathlen;
+    char *path = this->uri;
+    size_t pathlen = strlen(path);
 
     /* remove the first '/' */
-    path = this->uri;
-    pathlen = strlen(path);
     if (pathlen > 1) {
       path++;
       pathlen--;
diff --git a/src/input/mmsh.c b/src/input/mmsh.c
index 2feb7c37b..4ee7ed07d 100644
--- a/src/input/mmsh.c
+++ b/src/input/mmsh.c
@@ -190,11 +190,9 @@ struct mmsh_s {
 };
 
 static int send_command (mmsh_t *this, char *cmd)  {
-  int length;
-
   lprintf ("send_command:\n%s\n", cmd);
 
-  length = strlen(cmd);
+  const size_t length = strlen(cmd);
   if (_x_io_tcp_write(this->stream, this->s, cmd, length) != length) {
     xprintf (this->stream->xine, XINE_LOG_MSG, _("libmmsh: send error\n"));
     return 0;
-- 
cgit v1.2.3