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
Make cql_transform_rpn2cql_{stream,wrbuf} thread-safe
[yaz-moved-to-github.git]
/
include
/
yaz
/
json.h
diff --git
a/include/yaz/json.h
b/include/yaz/json.h
index
c30f10c
..
e403873
100644
(file)
--- a/
include/yaz/json.h
+++ b/
include/yaz/json.h
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data.
+ * Copyright (C) Index Data.
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@
-53,8
+53,8
@@
enum json_node_type {
struct json_node {
enum json_node_type type;
union {
struct json_node {
enum json_node_type type;
union {
- char *string;
- double number;
+ char *string;
+ double number;
struct json_node *link[2];
} u;
};
struct json_node *link[2];
} u;
};
@@
-86,7
+86,7
@@
struct json_node *json_parser_parse(json_parser_t p, const char *json_str);
/** \brief returns parser error
\param p JSON parser handle
/** \brief returns parser error
\param p JSON parser handle
- \returns parse error msg
+ \returns parse error msg
This function should be called if json_parser_parse returns NULL .
*/
This function should be called if json_parser_parse returns NULL .
*/
@@
-194,13
+194,6
@@
void json_write_wrbuf(struct json_node *node, WRBUF result);
YAZ_EXPORT
void json_write_wrbuf_pretty(struct json_node *node, WRBUF result);
YAZ_EXPORT
void json_write_wrbuf_pretty(struct json_node *node, WRBUF result);
-/** \brief writes JSON text to WRBUF with escaping
- \param b result
- \param str input string to be encoded
-*/
-YAZ_EXPORT
-void wrbuf_json_puts(WRBUF b, const char *str);
-
YAZ_END_CDECL
#endif
YAZ_END_CDECL
#endif