Changeset 438 for trunk/src/io

Timestamp:

07/23/15 17:29:49 (10 years ago)

Author:

epyon

Message:

• massive amount of std::string removal
• removed slurp, use filesystem::slurp instead
• lua_values const_string support
• several bugfixes
• program_manager and shader loading without std::string/std::stream

File:

• trunk/src/io/c_file_system.cc (modified) (3 diffs)

trunk/src/io/c_file_system.cc

@@ -11 +11 @@
 using namespace nv;
 
+
 c_file_system::c_file_system()
 {
@@ -21 +22 @@
 }
 
-bool c_file_system::exists( const char* fpath )
+bool c_file_system::exists( const string_view& fpath )
 {
-        FILE* file = ::fopen( fpath, "rb" );
+        FILE* file = ::fopen( fpath.data(), "rb" );
         if ( !file )
         {
@@ -32 +33 @@
 }
 
-stream* c_file_system::open( const char* fpath, const char* fmode /*= "rb" */ )
+stream* c_file_system::open( const string_view& fpath, const string_view& fmode /*= "rb" */ )
 {
-        NV_ASSERT( fpath != nullptr && fmode != nullptr, "Bad parameters passed to open" );
-        FILE* file = ::fopen( fpath, fmode );
+        NV_ASSERT( !fpath.empty() && !fmode.empty(), "Bad parameters passed to open" );
+        FILE* file = ::fopen( fpath.data(), fmode.data() );
         if ( !file )
         {
                 return nullptr;
         }
-        return new c_stream( file, fpath );
+        return new c_stream( file, fpath.data() );
 }
+
+nv::const_string c_file_system::slurp( const string_view& path )
+{
+        stream* fstream = open( path, "rb" );
+        if ( !fstream ) return const_string();
+        uint32 size = fstream->size();
+        const_string result( nullptr, size );
+        fstream->read( const_cast<char*>( result.data() ), size, 1 );
+        delete fstream;
+        return result;
+}