Merge branch 'master' of github.com:graphitemaster/gmqcc

[xonotic/gmqcc.git] / lexer.c

diff --git a/lexer.c b/lexer.c
index 01842cc0f5df9dc3b9ca0e912d8c87acb57c7fe5..e506aec31ef8c105f7c3ef5de7a74eefd560d809 100644 (file)
--- a/lexer.c
+++ b/lexer.c
@@ -184,7 +184,7 @@ static void lex_token_new(lex_file *lex)
 lex_file* lex_open(const char *file)
 {
     lex_file *lex;
 lex_file* lex_open(const char *file)
 {
     lex_file *lex;

-    FILE *in = util_fopen(file, "rb");
+    FILE *in = file_open(file, "rb");

 
     if (!in) {
         lexerror(NULL, "open failed: '%s'\n", file);
 
     if (!in) {
         lexerror(NULL, "open failed: '%s'\n", file);


@@ -193,7 +193,7 @@ lex_file* lex_open(const char *file)
 
     lex = (lex_file*)mem_a(sizeof(*lex));
     if (!lex) {
 
     lex = (lex_file*)mem_a(sizeof(*lex));
     if (!lex) {

-        fclose(in);
+        file_close(in);

         lexerror(NULL, "out of memory\n");
         return NULL;
     }
         lexerror(NULL, "out of memory\n");
         return NULL;
     }


@@ -258,7 +258,7 @@ void lex_close(lex_file *lex)
         vec_free(lex->modelname);
 
     if (lex->file)
         vec_free(lex->modelname);
 
     if (lex->file)

-        fclose(lex->file);
+        file_close(lex->file);

 #if 0
     if (lex->tok)
         token_delete(lex->tok);
 #if 0
     if (lex->tok)
         token_delete(lex->tok);