Commit 009274f4 authored by Jonathan Beck's avatar Jonathan Beck

Reverse argument for dicts to make it clearer.

parent 77b02c94
...@@ -262,7 +262,7 @@ extern "C" { ...@@ -262,7 +262,7 @@ extern "C" {
* @param item the new item associated to key * @param item the new item associated to key
* @param key the identifier of the item to get. Assert if identifier is not present. * @param key the identifier of the item to get. Assert if identifier is not present.
*/ */
PLIST_API void plist_dict_set_item(plist_t node, plist_t item, const char* key); PLIST_API void plist_dict_set_item(plist_t node, const char* key, plist_t item);
/** /**
* Insert a new item at position n in a #PLIST_DICT node. * Insert a new item at position n in a #PLIST_DICT node.
...@@ -271,7 +271,7 @@ extern "C" { ...@@ -271,7 +271,7 @@ extern "C" {
* @param item the new item to insert * @param item the new item to insert
* @param key The identifier of the item to insert. Assert if identifier already present. * @param key The identifier of the item to insert. Assert if identifier already present.
*/ */
PLIST_API void plist_dict_insert_item(plist_t node, plist_t item, const char* key); PLIST_API void plist_dict_insert_item(plist_t node, const char* key, plist_t item);
/** /**
* Remove an existing position in a #PLIST_DICT node. * Remove an existing position in a #PLIST_DICT node.
...@@ -658,7 +658,6 @@ extern "C" { ...@@ -658,7 +658,6 @@ extern "C" {
*/ */
PLIST_API void plist_add_sub_date_el(plist_t node, int32_t sec, int32_t usec); PLIST_API void plist_add_sub_date_el(plist_t node, int32_t sec, int32_t usec);
/*@}*/ /*@}*/
......
...@@ -268,15 +268,15 @@ plist_t plist_dict_get_item(plist_t node, const char* key) ...@@ -268,15 +268,15 @@ plist_t plist_dict_get_item(plist_t node, const char* key)
if (node && PLIST_DICT == plist_get_node_type(node)) { if (node && PLIST_DICT == plist_get_node_type(node)) {
plist_t current = NULL; plist_t current = NULL;
for (current = plist_get_first_child(node); for (current = (plist_t)g_node_first_child(node);
current; current;
current = plist_get_next_sibling(plist_get_next_sibling(current))) { current = (plist_t)g_node_next_sibling(g_node_next_sibling(current))) {
assert( PLIST_KEY == plist_get_node_type(current) ); assert( PLIST_KEY == plist_get_node_type(current) );
plist_data_t data = plist_get_data(current); plist_data_t data = plist_get_data(current);
if (data && !strcmp(key, data->strval)) { if (data && !strcmp(key, data->strval)) {
ret = plist_get_next_sibling(current); ret = (plist_t)g_node_next_sibling(current);
break; break;
} }
} }
...@@ -284,7 +284,7 @@ plist_t plist_dict_get_item(plist_t node, const char* key) ...@@ -284,7 +284,7 @@ plist_t plist_dict_get_item(plist_t node, const char* key)
return ret; return ret;
} }
void plist_dict_set_item(plist_t node, plist_t item, const char* key) void plist_dict_set_item(plist_t node, const char* key, plist_t item)
{ {
if (node && PLIST_DICT == plist_get_node_type(node)) { if (node && PLIST_DICT == plist_get_node_type(node)) {
plist_t old_item = plist_dict_get_item(node, key); plist_t old_item = plist_dict_get_item(node, key);
...@@ -297,7 +297,7 @@ void plist_dict_set_item(plist_t node, plist_t item, const char* key) ...@@ -297,7 +297,7 @@ void plist_dict_set_item(plist_t node, plist_t item, const char* key)
return; return;
} }
void plist_dict_insert_item(plist_t node, plist_t item, const char* key) void plist_dict_insert_item(plist_t node, const char* key, plist_t item)
{ {
if (node && PLIST_DICT == plist_get_node_type(node)) { if (node && PLIST_DICT == plist_get_node_type(node)) {
g_node_append(node, plist_new_key(key)); g_node_append(node, plist_new_key(key));
...@@ -357,7 +357,7 @@ static plist_t plist_find_node(plist_t plist, plist_type type, const void *value ...@@ -357,7 +357,7 @@ static plist_t plist_find_node(plist_t plist, plist_type type, const void *value
if (!plist) if (!plist)
return NULL; return NULL;
for (current = plist_get_first_child(plist); current; current = plist_get_next_sibling(current)) { for (current = (plist_t)g_node_first_child(plist); current; current = (plist_t)g_node_next_sibling(current)) {
plist_data_t data = plist_get_data(current); plist_data_t data = plist_get_data(current);
...@@ -658,6 +658,7 @@ void plist_set_date_val(plist_t node, int32_t sec, int32_t usec) ...@@ -658,6 +658,7 @@ void plist_set_date_val(plist_t node, int32_t sec, int32_t usec)
//DEPRECATED API BELOW //DEPRECATED API BELOW
static plist_t plist_add_sub_element(plist_t node, plist_type type, const void *value, uint64_t length) static plist_t plist_add_sub_element(plist_t node, plist_type type, const void *value, uint64_t length)
{ {
//only structured types can have children //only structured types can have children
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment