Athena YAML refactor

AxioDL · Aug 22, 2016 · 9b9dae6 · 9b9dae6
1 parent 3bc81a3
commit 9b9dae6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/extern/athena b/extern/athena
diff --git a/lib/CVarManager.cpp b/lib/CVarManager.cpp
@@ -105,10 +105,9 @@ void CVarManager::deserialize(CVar* cvar)
         filename += _S(".yaml");
         if (hecl::Stat(filename.c_str(), &st) || !S_ISREG(st.st_mode))
             return;
-        FILE* f = hecl::Fopen(filename.c_str(), _S("rb"));
-        if (f)
-            container.fromYAMLFile(f);
-        fclose(f);
+        athena::io::FileReader reader(filename);
+        if (reader.isOpen())
+            container.fromYAMLStream(reader);
     }
 
 
@@ -163,10 +162,9 @@ void CVarManager::serialize()
     else
     {
         filename += _S(".yaml");
-        FILE* f = hecl::Fopen(filename.c_str(), _S("wb"));
-        if (f)
-            container.toYAMLFile(f);
-        fclose(f);
+        athena::io::FileWriter writer(filename);
+        if (writer.isOpen())
+            container.toYAMLStream(writer);
     }
 }