Permalink
Browse files

Revert "multiple defined new function as yajl_tree_get"

This reverts commit 0fa6968.
  • Loading branch information...
1 parent 0fa6968 commit 5054820a02c8635996a9949943ef4a64522fce5b Martin Brown committed Jan 19, 2012
Showing with 4 additions and 4 deletions.
  1. +3 −3 src/api/yajl_tree.h
  2. +1 −1 src/yajl_tree.c
View
@@ -146,16 +146,16 @@ YAJL_API void yajl_tree_free (yajl_val v);
YAJL_API yajl_val yajl_tree_get(yajl_val parent, const char ** path, yajl_type type);
/**
- * Access an immediate value inside a tree.
+ * Access a value inside an object.
*
- * \param parent the object from which you'd like to extract values.
+ * \param object the object from which you'd like to extract values.
* \param key the key of the value in the object
* \param type the yajl_type of the object you seek, or yajl_t_any if any will do.
*
* \returns a pointer to the found value, or NULL if we came up empty.
*
*/
-YAJL_API yajl_val yajl_tree_get(yajl_val parent, const char * key, yajl_type type);
+YAJL_API yajl_val yajl_object_get(yajl_val object, const char * key, yajl_type type);
/* Various convenience macros to check the type of a `yajl_val` */
#define YAJL_IS_STRING(v) (((v) != NULL) && ((v)->type == yajl_t_string))
View
@@ -452,7 +452,7 @@ yajl_val yajl_tree_parse (const char *input,
return (ctx.root);
}
-yajl_val yajl_tree_get(yajl_val n, const char * key, yajl_type type)
+yajl_val yajl_object_get(yajl_val n, const char * key, yajl_type type)
{
const char ** path = {key, 0};
yajl_val v = yajl_tree_get(n, path, type);

0 comments on commit 5054820

Please sign in to comment.