From 0b6b09c0fe2fdd21b18593192e7213d1b0098f12 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Wed, 21 Nov 2007 20:05:07 +0000
Subject: Change json_parser_get_root() semantics

The json_parser_get_root() returns a pointer to the root node. This does
not conform to the API naming convention inherited from GLib, where
functions returning an internal pointer are called "peek" and function
returning a copy are called "get".

Thus, json_parser_get_root() will now return a copy of the root node and
it is left to the developer to free the returned JsonNode.

A function returning the pointer has also been added, and it's called
json_parser_peek_root().
---
 json-glib/json-parser.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'json-glib/json-parser.c')

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,22 +1072,44 @@ 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);
 
   return parser->priv->root;
 }
 
+/**
+ * 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
-- 
cgit v1.2.1