Merge branch 'master' into yaz-744

[yaz-moved-to-github.git] / src / cqlstdio.c

diff --git a/src/cqlstdio.c b/src/cqlstdio.c
index d5458cb..b647828 100644 (file)
--- a/src/cqlstdio.c
+++ b/src/cqlstdio.c
@@ -1,16 +1,18 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
-
 /**
  * \file cqlstdio.c
  * \brief Implements query stream reading using FILE handle.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <yaz/cql.h>
 
-int getbyte_stream(void *client_data)
+static int getbyte_stream(void *client_data)
 {
     FILE *f = (FILE*) client_data;
 
@@ -20,7 +22,7 @@ int getbyte_stream(void *client_data)
     return c;
 }
 
-void ungetbyte_stream (int c, void *client_data)
+static void ungetbyte_stream(int c, void *client_data)
 {
     FILE *f = (FILE*) client_data;
 
@@ -38,6 +40,7 @@ int cql_parser_stdio(CQL_parser cp, FILE *f)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab