From 14984575cafad7a9c913e2105a0b065a87da4832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@simphalempin.com>
Date: Sat, 5 Jul 2008 21:26:15 +0300
Subject: [PATCH] Bunch of warnings
---
modules/access/dvb/en50221.c | 4 ++--
modules/access/rtmp/access.c | 4 ++--
modules/access_output/dummy.c | 8 +++++---
modules/control/http/util.c | 2 +-
modules/misc/dummy/input.c | 2 +-
modules/stream_out/rtp.c | 1 +
src/playlist/item.c | 2 +-
7 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c
index 093219a0c917..9a78e97f0f72 100644
--- a/modules/access/dvb/en50221.c
+++ b/modules/access/dvb/en50221.c
@@ -2320,8 +2320,8 @@ static inline void *FixUTF8( char *p )
static char *dvbsi_to_utf8( char *psz_instring, size_t i_length )
{
- const char *psz_encoding;
- char *psz_stringstart, *psz_outstring, *psz_tmp;
+ const char *psz_encoding, *psz_stringstart;
+ char *psz_outstring, *psz_tmp;
char psz_encbuf[12];
size_t i_in, i_out;
vlc_iconv_t iconv_handle;
diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index cc580c350057..0d3ad022f08e 100644
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -66,7 +66,7 @@ vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Read( access_t *, uint8_t *, size_t ); /*DOWN: last parameter int */
+static ssize_t Read( access_t *, uint8_t *, size_t );
static int Seek( access_t *, int64_t );
static int Control( access_t *, int, va_list );
@@ -299,7 +299,7 @@ static void Close( vlc_object_t * p_this )
/*****************************************************************************
* Read: standard read on a file descriptor.
*****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
+static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
{
access_sys_t *p_sys = p_access->p_sys;
rtmp_packet_t *rtmp_packet;
diff --git a/modules/access_output/dummy.c b/modules/access_output/dummy.c
index 23893c384c2a..183e41d323d2 100644
--- a/modules/access_output/dummy.c
+++ b/modules/access_output/dummy.c
@@ -55,7 +55,7 @@ vlc_module_end();
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static int Write( sout_access_out_t *, block_t * );
+static ssize_t Write( sout_access_out_t *, block_t * );
static int Seek ( sout_access_out_t *, off_t );
/*****************************************************************************
@@ -85,9 +85,9 @@ static void Close( vlc_object_t * p_this )
/*****************************************************************************
* Read: standard read on a file descriptor.
*****************************************************************************/
-static int Write( sout_access_out_t *p_access, block_t *p_buffer )
+static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer )
{
- int64_t i_write = 0;
+ size_t i_write = 0;
block_t *b = p_buffer;
while( b )
@@ -99,6 +99,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
block_ChainRelease( p_buffer );
+ (void)p_access;
return i_write;
}
@@ -107,6 +108,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
*****************************************************************************/
static int Seek( sout_access_out_t *p_access, off_t i_pos )
{
+ (void)p_access; (void)i_pos;
return 0;
}
diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index 845694e313c4..067d4bb784d7 100644
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -188,7 +188,7 @@ int ParseDirectory( intf_thread_t *p_intf, char *psz_root,
struct stat st;
if( stat( dir, &st ) == 0 )
{
- closedir( dir );
+ closedir( p_dir );
return VLC_EGENERIC;
}
p_acl = NULL;
diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c
index c2faae85ca7e..fad1f6037ad5 100644
--- a/modules/misc/dummy/input.c
+++ b/modules/misc/dummy/input.c
@@ -39,7 +39,7 @@
/*****************************************************************************
* Access functions.
*****************************************************************************/
-static int AccessRead( access_t *p_access, uint8_t *p, int i_size )
+static ssize_t AccessRead( access_t *p_access, uint8_t *p, int i_size )
{
VLC_UNUSED(p_access);
memset( p, 0, i_size );
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 36efc8f959bc..fb79a6881801 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -1311,6 +1311,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t *p_next;
assert( p_stream->p_sys->p_mux == NULL );
+ (void)p_stream;
while( p_buffer != NULL )
{
diff --git a/src/playlist/item.c b/src/playlist/item.c
index 20ee6f2e9b43..fcde872659f6 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -750,7 +750,7 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
val.p_address = p_add;
p_playlist->b_reset_currently_playing = true;
if( b_signal )
- vlc_object_signal_maybe( p_playlist );
+ vlc_object_signal_maybe( VLC_OBJECT(p_playlist) );
var_Set( p_playlist, "item-append", val );
free( p_add );
}
--
GitLab