#include <assert.h>
#include "graph.h"
-#include "graph_list.h"
#include "graph_ident.h"
+#include "graph_instance.h"
+#include "graph_list.h"
#include "graph_def.h"
#include "graph_config.h"
#include "common.h"
#define COPY_FIELD(field) do { \
const char *str = ident_get_##field (cfg->select); \
char uri_str[1024]; \
- uri_escape (uri_str, str, sizeof (uri_str)); \
+ uri_escape_copy (uri_str, str, sizeof (uri_str)); \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
strlcat (buffer, uri_str, buffer_size); \