summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--json-glib/json-parser.c26
-rw-r--r--json-glib/json-parser.h2
2 files changed, 26 insertions, 2 deletions
diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c
index 60cc39a..9d40add 100644
--- a/json-glib/json-parser.c
+++ b/json-glib/json-parser.c
@@ -1072,16 +1072,18 @@ json_parser_load_from_data (JsonParser *parser,
}
/**
- * json_parser_get_root:
+ * json_parser_peek_root:
* @parser: a #JsonParser
*
* Retrieves the top level node from the parsed JSON stream.
*
* Return value: the root #JsonNode . The returned node is owned by
* the #JsonParser and should never be modified or freed.
+ *
+ * Since: 0.6
*/
JsonNode *
-json_parser_get_root (JsonParser *parser)
+json_parser_peek_root (JsonParser *parser)
{
g_return_val_if_fail (JSON_IS_PARSER (parser), NULL);
@@ -1089,6 +1091,26 @@ json_parser_get_root (JsonParser *parser)
}
/**
+ * json_parser_get_root:
+ * @parser: a #JsonParser
+ *
+ * Retrieves a copy of the top level node from the parsed JSON stream.
+ *
+ * Return value: a newly allocated copy of the root #JsonNode. Use
+ * json_node_free() to free its allocated resources.
+ */
+JsonNode *
+json_parser_get_root (JsonParser *parser)
+{
+ g_return_val_if_fail (JSON_IS_PARSER (parser), NULL);
+
+ if (!parser->priv->root)
+ return NULL;
+
+ return json_node_copy (parser->priv->root);
+}
+
+/**
* json_parser_get_current_line:
* @parser: a #JsonParser
*
diff --git a/json-glib/json-parser.h b/json-glib/json-parser.h
index 37324a9..c7fd570 100644
--- a/json-glib/json-parser.h
+++ b/json-glib/json-parser.h
@@ -140,6 +140,8 @@ gboolean json_parser_load_from_data (JsonParser *parser,
const gchar *data,
gsize length,
GError **error);
+
+JsonNode * json_parser_peek_root (JsonParser *parser);
JsonNode * json_parser_get_root (JsonParser *parser);
guint json_parser_get_current_line (JsonParser *parser);