From c40cb8b83420574f0ce26d72f1761ae9775773c8 Mon Sep 17 00:00:00 2001 From: Rocky Bernstein Date: Sun, 7 Mar 2004 16:03:25 +0000 Subject: [PATCH] More printf lint for cygwin (and possibly others) --- modules/access/cdda/access.c | 18 ++++++++++++------ modules/access/vcdx/access.c | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c index ae02ee4e08..4cb26cc2c9 100644 --- a/modules/access/cdda/access.c +++ b/modules/access/cdda/access.c @@ -2,7 +2,7 @@ * cddax.c : CD digital audio input module for vlc using libcdio ***************************************************************************** * Copyright (C) 2000, 2003, 2004 VideoLAN - * $Id: access.c,v 1.28 2004/02/23 00:10:50 rocky Exp $ + * $Id$ * * Authors: Rocky Bernstein * Laurent Aimar @@ -72,9 +72,11 @@ static int CDDAFixupPlayList( input_thread_t *p_input, cdda_data_t *p_cdda, const char *psz_source, bool play_single_track); +#if NEED_UPDATE_VAR static void CDDAUpdateVar( input_thread_t *p_input, int i_entry, int i_action, const char *p_varname, char *p_label, const char *p_debug_label ); +#endif /**************************************************************************** @@ -211,7 +213,8 @@ static int CDDARead( input_thread_t * p_input, byte_t * p_buffer, if( cdio_read_audio_sector( p_cdda->p_cddev->cdio, p_buffer, p_cdda->i_sector) != 0 ) { - msg_Err( p_input, "could not read sector %d", p_cdda->i_sector ); + msg_Err( p_input, "could not read sector %lu", + (long unsigned int) p_cdda->i_sector ); return -1; } @@ -221,7 +224,8 @@ static int CDDARead( input_thread_t * p_input, byte_t * p_buffer, input_area_t *p_area; dbg_print( (INPUT_DBG_LSN|INPUT_DBG_CALL), - "end of track, cur: %u", p_cdda->i_sector ); + "end of track, cur: %lu", + (long unsigned int) p_cdda->i_sector ); /*???? if ( p_cdda->i_track >= p_cdda->i_nb_tracks - 1 )*/ return 0; /* EOF */ @@ -322,11 +326,13 @@ static void CDDASeek( input_thread_t * p_input, off_t i_off ) vlc_mutex_unlock( &p_input->stream.stream_lock ); dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_SEEK), - "sector %ud, offset: %lld, i_tell: %lld", p_cdda->i_sector, i_off, + "sector %lu, offset: %lld, i_tell: %lld", + (long unsigned int) p_cdda->i_sector, i_off, p_input->stream.p_selected_area->i_tell ); } +#if NEED_UPDATE_VAR /**************************************************************************** Update the "varname" variable to i_num without triggering a callback. ****************************************************************************/ @@ -344,7 +350,7 @@ CDDAUpdateVar( input_thread_t *p_input, int i_num, int i_action, } var_Change( p_input, p_varname, i_action, &val, NULL ); } - +#endif #define meta_info_add_str(title, str) \ if ( str ) { \ @@ -366,13 +372,13 @@ static void InformationCreate( input_thread_t *p_input ) playlist_t *p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT ); input_info_category_t *p_cat; - playlist_item_t *p_item; p_cat = input_InfoCategory( p_input, "General" ); #ifdef HAVE_LIBCDDB if (p_cdda->i_cddb_enabled) { + playlist_item_t *p_item; meta_info_add_str( "Title", p_cdda->cddb.disc->title ); meta_info_add_str( "Artist", p_cdda->cddb.disc->artist ); diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c index 85f1fd0049..27c41c5510 100644 --- a/modules/access/vcdx/access.c +++ b/modules/access/vcdx/access.c @@ -252,7 +252,7 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) p_vcd->cur_lsn >= p_vcd->p_entries[i_entry+1] ) { dbg_print( INPUT_DBG_PBC, - "new entry, i_entry %d, sector %lu, es %lu", + "new entry, i_entry %d, sector %lu, es %u", i_entry, (long unsigned int) p_vcd->cur_lsn, p_vcd->p_entries[i_entry] ); p_vcd->play_item.num = -- 2.39.2