diff options
author | Emmanuele Bassi <ebassi@openedhand.com> | 2008-01-29 18:14:49 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@openedhand.com> | 2008-01-29 18:14:49 +0000 |
commit | a86a300fdc256ad4270881cf9b7b97367cd87c87 (patch) | |
tree | fb10a90ad050a3b26d22dee4f2a66798df733481 /json-glib/json-parser.c | |
parent | 9a167068edcde51b50a15bab4ee8623994eb9c04 (diff) | |
download | json-glib-a86a300fdc256ad4270881cf9b7b97367cd87c87.tar.gz |
Revert JsonParser::get_root semantics
The get_root() method should not return a copy of the parsed node: it is
up to the developer copying it, if it needs to be kept around across multiple
parsing runs.
This commit reverts the 0b6b09c0 commit, by removing the peek_root() method
and restoring the previous get_root() method behaviour.
Diffstat (limited to 'json-glib/json-parser.c')
-rw-r--r-- | json-glib/json-parser.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c index 02524a7..d79098b 100644 --- a/json-glib/json-parser.c +++ b/json-glib/json-parser.c @@ -1078,42 +1078,20 @@ json_parser_load_from_data (JsonParser *parser, } /** - * json_parser_peek_root: + * json_parser_get_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_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); + return parser->priv->root; } /** |