From: Jens Axboe <axboe@fb.com>
Date: Wed, 15 Oct 2014 03:12:22 +0000 (-0600)
Subject: Get rid if --header-file argument for lex
X-Git-Tag: fio-2.1.14~52
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=de06a46881e1a8876b5fd1de5e002d6189a90a30;p=fio.git

Get rid if --header-file argument for lex

Since we now wrap the lexer_input() call, should be safe to just
get rid of the lexer.h define since we don't need size_t/yy_size_t.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/.gitignore b/.gitignore
index f13ec27d..c9d90fb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,3 @@
 /fio
 y.tab.*
 lex.yy.c
-lexer.h
diff --git a/Makefile b/Makefile
index 750eccdb..0f77df99 100644
--- a/Makefile
+++ b/Makefile
@@ -267,7 +267,7 @@ override CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
 
 ifdef CONFIG_ARITHMETIC
 lex.yy.c: exp/expression-parser.l
-	$(QUIET_LEX)$(LEX) --header-file=lexer.h exp/expression-parser.l
+	$(QUIET_LEX)$(LEX) exp/expression-parser.l
 
 lex.yy.o: lex.yy.c y.tab.h
 	$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
diff --git a/exp/expression-parser.l b/exp/expression-parser.l
index 16e38732..856596ac 100644
--- a/exp/expression-parser.l
+++ b/exp/expression-parser.l
@@ -24,13 +24,13 @@
 
 #define YYSTYPE PARSER_VALUE_TYPE
 
-extern int lexer_input(char *buffer, size_t *nbytes, int buffersize);
+extern int lexer_input(char *buffer, unsigned int *nbytes, int buffersize);
 
 #undef YY_INPUT
 #define YY_INPUT(buffer, bytes_read, bytes_requested)			\
 ({									\
 	int __ret;							\
-	size_t __bread = bytes_read;					\
+	unsigned int __bread = bytes_read;				\
 	__ret = lexer_input((buffer), &__bread, (bytes_requested));	\
 	bytes_read = __bread;						\
 	__ret;								\
diff --git a/exp/expression-parser.y b/exp/expression-parser.y
index 83b5b302..8ae0c01e 100644
--- a/exp/expression-parser.y
+++ b/exp/expression-parser.y
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include "lexer.h"
 
 struct parser_value_type {
 	double dval;
@@ -188,7 +187,7 @@ expression:	expression '+' expression {
 static int lexer_read_offset = 0;
 static char lexer_input_buffer[1000];
 
-int lexer_input(char* buffer, yy_size_t *bytes_read, int bytes_requested)
+int lexer_input(char* buffer, unsigned int *bytes_read, int bytes_requested)
 {
 	int bytes_left = strlen(lexer_input_buffer) - lexer_read_offset;