From 75d005cf30df98d75e6748e168bbfc22763b5a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Fri, 27 Jan 2012 23:06:50 +0200 Subject: [PATCH] Remove inconsistently used check for --- configure.ac | 2 +- modules/access/bd/bd.c | 4 +--- modules/access/directory.c | 5 +---- modules/access/dvdnav.c | 9 ++------- modules/access/file.c | 6 +----- modules/access/mtp.c | 8 +------- modules/access/smb.c | 4 +--- modules/access/vcd/cdrom.c | 4 +--- modules/access/vdr.c | 4 +--- modules/demux/mp4/drms.c | 4 +--- modules/gui/ncurses.c | 4 +--- modules/gui/skins2/parser/xmlparser.cpp | 6 +----- modules/gui/skins2/src/theme_loader.cpp | 4 +--- modules/lua/libs/net.c | 5 ----- modules/media_library/sql_media_library.h | 4 +--- modules/meta_engine/folder.c | 4 +--- modules/misc/gnutls.c | 4 +--- src/input/es_out_timeshift.c | 4 +--- src/input/input.c | 4 +--- src/modules/bank.c | 4 +--- src/playlist/art.c | 4 +--- 21 files changed, 21 insertions(+), 76 deletions(-) diff --git a/configure.ac b/configure.ac index c0efd80d41..dc11ac0339 100644 --- a/configure.ac +++ b/configure.ac @@ -666,7 +666,7 @@ fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Check for headers AC_CHECK_HEADERS([search.h]) AC_CHECK_HEADERS(getopt.h locale.h xlocale.h) -AC_CHECK_HEADERS([sys/time.h sys/ioctl.h sys/stat.h]) +AC_CHECK_HEADERS([sys/time.h sys/ioctl.h]) AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c index 536d011110..f70df38c3d 100644 --- a/modules/access/bd/bd.c +++ b/modules/access/bd/bd.c @@ -29,10 +29,8 @@ # include "config.h" #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif #include +#include #include #include diff --git a/modules/access/directory.c b/modules/access/directory.c index f958e12cc4..8683d93c03 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -35,10 +35,7 @@ #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif - +#include #ifdef HAVE_UNISTD_H # include # include diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index e7f4a03b85..181708375d 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -34,9 +34,7 @@ # include #endif #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #include @@ -1452,20 +1450,17 @@ static int ProbeDVD( const char *psz_name ) #endif int ret = VLC_EGENERIC; - -#ifdef HAVE_SYS_STAT_H struct stat stat_info; if( fstat( fd, &stat_info ) == -1 ) goto bailout; - if( !S_ISREG( stat_info.st_mode ) ) { if( S_ISDIR( stat_info.st_mode ) || S_ISBLK( stat_info.st_mode ) ) ret = VLC_SUCCESS; /* Let dvdnav_open() do the probing */ goto bailout; } -#endif + /* Match extension as the anchor exhibits too many false positives */ const char *ext = strrchr( psz_name, '.' ); if( ext == NULL ) diff --git a/modules/access/file.c b/modules/access/file.c index 8f3a4a53e1..487c146d82 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -30,9 +30,7 @@ #include #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #ifdef HAVE_FSTATVFS # include @@ -313,7 +311,6 @@ ssize_t FileRead( access_t *p_access, uint8_t *p_buffer, size_t i_len ) if ((p_access->info.i_size && !(p_sys->i_nb_reads % INPUT_FSTAT_NB_READS)) || (p_access->info.i_pos > p_access->info.i_size)) { -#ifdef HAVE_SYS_STAT_H struct stat st; if ((fstat (fd, &st) == 0) @@ -322,7 +319,6 @@ ssize_t FileRead( access_t *p_access, uint8_t *p_buffer, size_t i_len ) p_access->info.i_size = st.st_size; p_access->info.i_update |= INPUT_UPDATE_SIZE; } -#endif } return i_ret; } diff --git a/modules/access/mtp.c b/modules/access/mtp.c index e51f418370..bbbbf4d1e3 100644 --- a/modules/access/mtp.c +++ b/modules/access/mtp.c @@ -33,9 +33,7 @@ #include #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #include #include @@ -158,14 +156,10 @@ static int Open( vlc_object_t *p_this ) } p_sys->fd = fd; -#ifdef HAVE_SYS_STAT_H struct stat st; if( fstat( fd, &st ) ) msg_Err( p_access, "fstat(%d): %m", fd ); p_access->info.i_size = st.st_size; -#else -# warning File size not known! -#endif return VLC_SUCCESS; } diff --git a/modules/access/smb.c b/modules/access/smb.c index 6ece3e05b1..8bf0cab0c8 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -31,9 +31,7 @@ #include #ifdef WIN32 # include -# ifdef HAVE_SYS_STAT_H -# include -# endif +# include # include # define smbc_open(a,b,c) vlc_open(a,b,c) # define smbc_fstat(a,b) _fstati64(a,b) diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c index 0fd02635cd..2b6746680d 100644 --- a/modules/access/vcd/cdrom.c +++ b/modules/access/vcd/cdrom.c @@ -38,9 +38,7 @@ # include #endif #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #ifdef HAVE_ARPA_INET_H # include diff --git a/modules/access/vdr.c b/modules/access/vdr.c index 8889490f34..79653bf7c3 100644 --- a/modules/access/vdr.c +++ b/modules/access/vdr.c @@ -46,9 +46,7 @@ See http://www.vdr-wiki.de/ and http://www.tvdr.de/ for more information. #endif #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #ifdef HAVE_UNISTD_H # include diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c index eb312b0617..c64ad2d6c9 100644 --- a/modules/demux/mp4/drms.c +++ b/modules/demux/mp4/drms.c @@ -41,9 +41,7 @@ #endif #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #include diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 2c0ceb2022..ec5319e0b7 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -38,9 +38,7 @@ #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #include diff --git a/modules/gui/skins2/parser/xmlparser.cpp b/modules/gui/skins2/parser/xmlparser.cpp index f660e28afe..bbb40c3017 100644 --- a/modules/gui/skins2/parser/xmlparser.cpp +++ b/modules/gui/skins2/parser/xmlparser.cpp @@ -25,9 +25,7 @@ #include "../src/os_factory.hpp" #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName ) : SkinObject( pIntf ), m_pXML( NULL ), m_pReader( NULL ), m_pStream( NULL ) @@ -79,7 +77,6 @@ void XMLParser::LoadCatalog() const string &sep = pOSFactory->getDirSeparator(); list::const_iterator it; -#ifdef HAVE_SYS_STAT_H struct stat statBuf; // Try to load the catalog first (needed at least on win32 where @@ -119,7 +116,6 @@ void XMLParser::LoadCatalog() { msg_Err( getIntf(), "cannot find the skins DTD"); } -#endif } bool XMLParser::parse() diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp index d76eae521a..c72c63047a 100644 --- a/modules/gui/skins2/src/theme_loader.cpp +++ b/modules/gui/skins2/src/theme_loader.cpp @@ -27,9 +27,7 @@ #endif #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #ifdef HAVE_UNISTD_H # include #endif diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c index 33e3750c7d..ea6124598c 100644 --- a/modules/lua/libs/net.c +++ b/modules/lua/libs/net.c @@ -271,7 +271,6 @@ static int vlclua_fd_read( lua_State *L ) *****************************************************************************/ static int vlclua_stat( lua_State *L ) { -#ifdef HAVE_SYS_STAT_H const char *psz_path = luaL_checkstring( L, 1 ); struct stat s; if( vlc_stat( psz_path, &s ) ) @@ -320,10 +319,6 @@ static int vlclua_stat( lua_State *L ) lua_pushinteger( L, s.st_ctime ); lua_setfield( L, -2, "creation_time" ); return 1; -#else -# warning "Woops, looks like we don't have stat on your platform" - return luaL_error( L, "System is missing " ); -#endif } static int vlclua_opendir( lua_State *L ) diff --git a/modules/media_library/sql_media_library.h b/modules/media_library/sql_media_library.h index 572394e220..705c0a02a3 100644 --- a/modules/media_library/sql_media_library.h +++ b/modules/media_library/sql_media_library.h @@ -31,9 +31,7 @@ #include #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #include diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c index 724bae6b00..7ca42566d1 100644 --- a/modules/meta_engine/folder.c +++ b/modules/meta_engine/folder.c @@ -29,9 +29,7 @@ # include "config.h" #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #include diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index 78771eb44d..b6b18955c9 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -31,9 +31,7 @@ #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #ifdef WIN32 # include # include diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c index ca4d8d01ec..9a8b82d3be 100644 --- a/src/input/es_out_timeshift.c +++ b/src/input/es_out_timeshift.c @@ -34,9 +34,7 @@ #if defined (WIN32) && !defined (UNDER_CE) # include #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #ifdef HAVE_UNISTD_H # include #endif diff --git a/src/input/input.c b/src/input/input.c index 445dc142e7..b6e5bd23aa 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -34,9 +34,7 @@ #include #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include "input_internal.h" #include "event.h" diff --git a/src/modules/bank.c b/src/modules/bank.c index 5e79094a08..e074fef17c 100644 --- a/src/modules/bank.c +++ b/src/modules/bank.c @@ -34,9 +34,7 @@ #include #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #ifdef HAVE_UNISTD_H # include #endif diff --git a/src/playlist/art.c b/src/playlist/art.c index 08c794ebf6..dc71212b62 100644 --- a/src/playlist/art.c +++ b/src/playlist/art.c @@ -27,9 +27,7 @@ #endif #include -#ifdef HAVE_SYS_STAT_H -# include -#endif +#include #include #include -- GitLab