Misc warnings fixes.

CVS patchset: 8055
CVS date: 2006/06/18 20:29:03

4 files changed, 9 insertions, 8 deletions

diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 32789950b..56c8e6cd4 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -879,7 +879,7 @@ static channel_t *load_channels(dvb_input_plugin_t *this, int *num_ch, fe_type_t
   f = fopen(filename, "rb");
   if (!f) {
     xprintf(xine, XINE_VERBOSITY_LOG, _("input_dvb: failed to open dvb channel file '%s'\n"), filename);
-    _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, filename, "Please run the dvbscan utility.");
+    _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, filename, "Please run the dvbscan utility.", NULL);
     return NULL;
   }
 
@@ -1268,7 +1268,7 @@ static void dvb_parse_si(dvb_input_plugin_t *this) {
 /* Helper function for finding the channel index in the channels struct
    given the service_id. If channel is not found, -1 is returned. */
 static int channel_index(dvb_input_plugin_t* this, unsigned int service_id) {
-  int n;
+  unsigned int n;
   for (n=0; n < this->num_channels; n++)
     if (this->channels[n].service_id == service_id) 
 	return n;
diff --git a/src/input/input_smb.c b/src/input/input_smb.c
index b1c98c5aa..d1c1e46bf 100644
--- a/src/input/input_smb.c
+++ b/src/input/input_smb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_smb.c,v 1.12 2006/06/02 22:18:57 dsalt Exp $
+ * $Id: input_smb.c,v 1.13 2006/06/18 20:29:04 dgp85 Exp $
  */
 
 
@@ -239,7 +239,7 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen,
   
 	smb_input_class_t   *this = (smb_input_class_t *) this_gen;
 	int                 (*func) ()        = _sortfiles_default;
-	unsigned int        dir;
+	int        dir;
 	int i;
 	struct smbc_dirent  *pdirent;
 	char current_path [XINE_PATH_MAX + 1];
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index cc18772f8..6ca50ac87 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -803,7 +803,8 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
 {
   int          found       = 0;
   int          tuner_found = 0;
-  int          i, j, ret;
+  int          i, ret;
+  unsigned int j;
   cfg_entry_t *entry;
   
   lprintf("open_video_capture_device\n");
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 4612d7425..22a9f5e17 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1,5 +1,5 @@
 /*
-  $Id: xineplug_inp_vcd.c,v 1.47 2006/04/21 22:34:19 dsalt Exp $
+  $Id: xineplug_inp_vcd.c,v 1.48 2006/06/18 20:29:04 dgp85 Exp $
  
   Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
   
@@ -261,7 +261,7 @@ vcd_add_mrl_slot(vcd_input_class_t *this, const char *mrl, off_t size,
   
   this->mrls[*i] = malloc(sizeof(xine_mrl_t));
   if (NULL==this->mrls[*i]) {
-    LOG_ERR("Can't malloc %d bytes for MRL slot %d (%s)", 
+    LOG_ERR("Can't malloc %zu bytes for MRL slot %u (%s)", 
             sizeof(xine_mrl_t), *i, mrl);
     return;
   }
@@ -272,7 +272,7 @@ vcd_add_mrl_slot(vcd_input_class_t *this, const char *mrl, off_t size,
   
   this->mrls[*i]->mrl = (char *) malloc(strlen(mrl) + 1);
   if (NULL==this->mrls[*i]->mrl) {
-    LOG_ERR("Can't malloc %d bytes for MRL name %s", sizeof(xine_mrl_t), mrl);
+    LOG_ERR("Can't malloc %zu bytes for MRL name %s", sizeof(xine_mrl_t), mrl);
   } else {
     sprintf(this->mrls[*i]->mrl, "%s", mrl);
   }