projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaz-iconv: fix typos
[yaz-moved-to-github.git]
/
src
/
tokenizer.c
diff --git
a/src/tokenizer.c
b/src/tokenizer.c
index
cf76c89
..
db73fe9
100644
(file)
--- a/
src/tokenizer.c
+++ b/
src/tokenizer.c
@@
-1,17
+1,18
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-
/**
* \file tokenizer.c
* \brief Simple tokenizer system.
*/
/**
* \file tokenizer.c
* \brief Simple tokenizer system.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
-#include <ctype.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
#include <yaz/tokenizer.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
#include <yaz/tokenizer.h>
@@
-20,7
+21,7
@@
struct yaz_tok_parse {
int unget_byte;
WRBUF wr_string;
int look;
int unget_byte;
WRBUF wr_string;
int look;
-
+
yaz_tok_cfg_t cfg;
yaz_tok_get_byte_t get_byte_func;
void *get_byte_data;
yaz_tok_cfg_t cfg;
yaz_tok_get_byte_t get_byte_func;
void *get_byte_data;
@@
-117,7
+118,7
@@
yaz_tok_parse_t yaz_tok_parse_create(yaz_tok_cfg_t t,
tp->wr_string = wrbuf_alloc();
return tp;
}
tp->wr_string = wrbuf_alloc();
return tp;
}
-
+
void yaz_tok_parse_destroy(yaz_tok_parse_t tp)
{
void yaz_tok_parse_destroy(yaz_tok_parse_t tp)
{
@@
-135,7
+136,7
@@
int yaz_tok_move(yaz_tok_parse_t tp)
/* skip white space */
while (ch && strchr(t->white_space, ch))
ch = get_byte(tp);
/* skip white space */
while (ch && strchr(t->white_space, ch))
ch = get_byte(tp);
- if (!ch)
+ if (!ch)
ch = YAZ_TOK_EOF;
else if (strchr(t->comment, ch))
ch = YAZ_TOK_EOF;
ch = YAZ_TOK_EOF;
else if (strchr(t->comment, ch))
ch = YAZ_TOK_EOF;