Removed preprocessor_clearerror().

icculus · Feb 10, 2009 · 7c8ac35 · 7c8ac35
1 parent ddf375e
commit 7c8ac35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/mojoshader_internal.h b/mojoshader_internal.h
@@ -342,7 +342,6 @@ Preprocessor *preprocessor_start(const char *fname, const char *source,
 
 void preprocessor_end(Preprocessor *pp);
 const char *preprocessor_error(Preprocessor *pp);
-void preprocessor_clearerror(Preprocessor *pp);
 int preprocessor_outofmemory(Preprocessor *pp);
 const char *preprocessor_nexttoken(Preprocessor *_ctx,
                                    unsigned int *_len, Token *_token);

diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c
@@ -304,17 +304,16 @@ void preprocessor_end(Preprocessor *_ctx)
 } // preprocessor_end
 
 
-void preprocessor_clearerror(Preprocessor *_ctx)
-{
-    Context *ctx = (Context *) _ctx;
-    ctx->isfail = 0;
-} // preprocessor_clearerror
-
-
 const char *preprocessor_error(Preprocessor *_ctx)
 {
     Context *ctx = (Context *) _ctx;
-    return ctx->isfail ? ctx->failstr : NULL;
+    if (ctx->isfail)
+    {
+        ctx->isfail = 0;
+        return ctx->failstr;
+    } // if
+
+    return NULL;
 } // preprocessor_error
 
 
@@ -670,7 +669,6 @@ include_close = (MOJOSHADER_includeClose) 0x1;
                 error_count++;
             } // else
 
-            preprocessor_clearerror(pp);
             continue;
         } // if