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 f13ec27d34f46af8cfe55e6cefde37bfc8b289db..c9d90fb6d736a0160ac85c9b18e63f39631372bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,3 @@
 /fio
 y.tab.*
 lex.yy.c
-lexer.h

diff --git a/Makefile b/Makefile
index 750eccdb19a890b3f4ee5890892dcbffd94107e2..0f77df9981c5d763d83c367a8de622f18c285ac0 100644 (file)
--- 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 16e38732360076a49f44b40a9d0f7f05438e0c92..856596acfa21aee603f0dc81fba70b7ca5ee03af 100644 (file)
--- 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 83b5b302ed1ae10ae8e40cb676cc1a13613b0777..8ae0c01ed50849a54a63aa3c8bc4f5d22563888f 100644 (file)
--- 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;