Browse Source

modules: use vlc_closedir instead of direct closedir

So it matches vlc_opendir() calls.
Steve Lhomme 4 years ago
committed by Alexandre Janniaux
parent
commit
4c44877d6d
  1. 2
      modules/access/dcp/dcp.cpp
  2. 4
      modules/access/directory.c
  3. 2
      modules/demux/mkv/mkv.cpp
  4. 2
      modules/gui/ncurses.c
  5. 2
      modules/gui/skins2/os2/os2_factory.cpp
  6. 6
      modules/gui/skins2/src/theme_loader.cpp
  7. 2
      modules/gui/skins2/src/theme_repository.cpp
  8. 2
      modules/gui/skins2/x11/x11_factory.cpp
  9. 2
      modules/lua/libs/io.c
  10. 2
      modules/lua/libs/net.c

2
modules/access/dcp/dcp.cpp

@ -977,7 +977,7 @@ static std::string assetmapPath( demux_t * p_demux )
break;
}
}
closedir( dir );
vlc_closedir( dir );
}
else
msg_Err( p_demux, "Could not open the directory: %s", p_dcp->path.c_str() );

4
modules/access/directory.c

@ -98,7 +98,7 @@ int DirInit (stream_t *access, DIR *dir)
return VLC_SUCCESS;
error:
closedir(dir);
vlc_closedir(dir);
return VLC_ENOMEM;
}
@ -128,7 +128,7 @@ void DirClose(vlc_object_t *obj)
access_sys_t *sys = access->p_sys;
free(sys->base_uri);
closedir(sys->dir);
vlc_closedir(sys->dir);
}
static int DirRead (stream_t *access, input_item_node_t *node)

2
modules/demux/mkv/mkv.cpp

@ -247,7 +247,7 @@ static int OpenInternal( demux_t *p_demux, bool trust_cues )
}
}
}
closedir( p_src_dir );
vlc_closedir( p_src_dir );
}
}

2
modules/gui/ncurses.c

@ -301,7 +301,7 @@ static void ReadDir(intf_thread_t *intf)
continue;
}
closedir(current_dir);
vlc_closedir(current_dir);
if (sys->n_dir_entries > 0)
qsort(sys->dir_entries, sys->n_dir_entries,

2
modules/gui/skins2/os2/os2_factory.cpp

@ -457,7 +457,7 @@ void OS2Factory::rmDir( const std::string &rPath )
}
// Close the directory
closedir( dir );
vlc_closedir( dir );
// And delete it
rmdir( rPath.c_str() );

6
modules/gui/skins2/src/theme_loader.cpp

@ -376,7 +376,7 @@ bool ThemeLoader::findFile( const std::string &rootDir, const std::string &rFile
// Can we find the file in this subdirectory?
if( findFile( newURI, rFileName, themeFilePath ) )
{
closedir( pCurrDir );
vlc_closedir( pCurrDir );
return true;
}
}
@ -386,14 +386,14 @@ bool ThemeLoader::findFile( const std::string &rootDir, const std::string &rFile
if( rFileName == std::string( pszDirContent ) )
{
themeFilePath = newURI;
closedir( pCurrDir );
vlc_closedir( pCurrDir );
return true;
}
}
}
}
closedir( pCurrDir );
vlc_closedir( pCurrDir );
return false;
}

2
modules/gui/skins2/src/theme_repository.cpp

@ -169,7 +169,7 @@ void ThemeRepository::parseDirectory( const std::string &rDir )
}
}
closedir( pDir );
vlc_closedir( pDir );
}

2
modules/gui/skins2/x11/x11_factory.cpp

@ -397,7 +397,7 @@ void X11Factory::rmDir( const std::string &rPath )
}
// Close the directory
closedir( dir );
vlc_closedir( dir );
// And delete it
rmdir( rPath.c_str() );

2
modules/lua/libs/io.c

@ -226,7 +226,7 @@ static int vlclua_io_readdir( lua_State *L )
lua_rawseti( L, -2, idx );
idx++;
}
closedir( p_dir );
vlc_closedir( p_dir );
return 1;
}

2
modules/lua/libs/net.c

@ -456,7 +456,7 @@ static int vlclua_opendir( lua_State *L )
lua_pushstring( L, psz_filename );
lua_rawseti( L, -2, i );
}
closedir( p_dir );
vlc_closedir( p_dir );
return 1;
}

Loading…
Cancel
Save