sysdb: Store a global input handler object in the input module.

[sysdb.git] / src / tools / sysdb / scanner.l

diff --git a/src/tools/sysdb/scanner.l b/src/tools/sysdb/scanner.l
index 518d299bea4707eabd1843b82f375e0c58f6f6c3..ba5d3b1b57313ca5e1e88cacd1e059e6f127a4f7 100644 (file)
--- a/src/tools/sysdb/scanner.l
+++ b/src/tools/sysdb/scanner.l
@@ -40,15 +40,13 @@
 #      undef YY_INPUT
 #endif
 #define YY_INPUT(buf, result, max_size) \
-       sdb_input_readline(sdb_input, (buf), &(result), (max_size))
+       sdb_input_readline((buf), &(result), (max_size))
 
 #define APPEND() \
        do { \
-               sdb_input->query_len += strlen(yytext); \
+               sysdb_input->query_len += strlen(yytext); \
        } while (0)
 
-static sdb_input_t *sdb_input;
-
 %}
 
 %option interactive
@@ -89,17 +87,11 @@ identifier  ([A-Za-z_][A-Za-z_0-9$]*)
         * The following rules are specific to the command line tool.
         */
 
-";"    { APPEND(); sdb_input_exec_query(sdb_input); }
+";"    { APPEND(); sdb_input_exec_query(); }
 
 .      { APPEND(); }
 
 %%
 
-void
-sdb_input_set(sdb_input_t *new_input)
-{
-       sdb_input = new_input;
-} /* sdb_input_set */
-
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */