projects
/
collection4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
graph_{data,def}_json actions: Don't destroy the graph_config_t object.
[collection4.git]
/
src
/
graph_ident.h
diff --git
a/src/graph_ident.h
b/src/graph_ident.h
index
5787ad5
..
6d033b3
100644
(file)
--- a/
src/graph_ident.h
+++ b/
src/graph_ident.h
@@
-25,7
+25,11
@@
#define GRAPH_IDENT_H 1
#include <time.h>
#define GRAPH_IDENT_H 1
#include <time.h>
+
+#include <yajl/yajl_gen.h>
+
#include "graph_types.h"
#include "graph_types.h"
+#include "data_provider.h"
#define ANY_TOKEN "/any/"
#define ALL_TOKEN "/all/"
#define ANY_TOKEN "/any/"
#define ALL_TOKEN "/all/"
@@
-86,7
+90,11
@@
_Bool ident_intersect (const graph_ident_t *s0, const graph_ident_t *s1);
char *ident_to_string (const graph_ident_t *ident);
char *ident_to_file (const graph_ident_t *ident);
char *ident_to_string (const graph_ident_t *ident);
char *ident_to_file (const graph_ident_t *ident);
-char *ident_to_json (const graph_ident_t *ident);
+int ident_to_json (const graph_ident_t *ident,
+ yajl_gen handler);
+int ident_data_to_json (const graph_ident_t *ident,
+ dp_time_t begin, dp_time_t end,
+ yajl_gen handler);
int ident_describe (const graph_ident_t *ident, const graph_ident_t *selector,
char *buffer, size_t buffer_size);
int ident_describe (const graph_ident_t *ident, const graph_ident_t *selector,
char *buffer, size_t buffer_size);