X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=lex.c;h=5673701157a7aaf1b47fd043d821054dcaa0e488;hp=560a1eaa84957df2b5269725e8710e2384919c29;hb=f67b6ea240ed62fd40d7383968940b8f90f0c6c9;hpb=98b0e1189074cbc734c166dc3d514f7eb8a7896b

diff --git a/lex.c b/lex.c
index 560a1ea..5673701 100644
--- a/lex.c
+++ b/lex.c
@@ -20,11 +20,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include <stdio.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
 #include "gmqcc.h"
 
 /*
@@ -249,7 +244,7 @@ static int lex_skipcmt(struct lex_file *file) {
 		lex_addch(ch, file);
 		while ((ch = lex_getch(file)) != '*') {
 			if (ch == EOF)
-				return error(ERROR_LEX, "malformatted comment at line", "");
+				return error(file, ERROR_LEX, "malformatted comment");
 			else
 				lex_addch(ch, file);
 		}
@@ -344,19 +339,15 @@ void lex_reset(struct lex_file *file) {
  * recrusion.
  */
 struct lex_file *lex_include(struct lex_file *lex, char *file) {
-	char *find = util_strrq(file);
-	/*
-	 * Dissallow recrusive include: this could easily cause some breakage
-	 * and instant OOM.
-	 */
+	util_strrq(file);
 	if (strncmp(lex->name, file, strlen(lex->name)) == 0) {
-		error(ERROR_LEX, "%s:%d Source file cannot include itself\n", lex->name, lex->line-1);
+		error(lex, ERROR_LEX, "Source file cannot include itself\n");
 		exit (-1);
 	}
 	
 	FILE *fp = fopen(file, "r");
 	if  (!fp) {
-		error(ERROR_LEX, "%s:%d Include file `%s` doesn't exist\n", lex->name, lex->line, file);
+		error(lex, ERROR_LEX, "Include file `%s` doesn't exist\n", file);
 		exit (-1);
 	}