From ff536344bc04ab9ec3763968b82997d07312acd6 Mon Sep 17 00:00:00 2001 From: Jonathan Beck Date: Tue, 10 Nov 2009 23:37:43 +0100 Subject: Remove deprecated functions from API. --- src/plist.c | 189 ------------------------------------------------------------ 1 file changed, 189 deletions(-) (limited to 'src/plist.c') diff --git a/src/plist.c b/src/plist.c index 9628e38..eac7cc0 100644 --- a/src/plist.c +++ b/src/plist.c @@ -786,192 +786,3 @@ void plist_set_date_val(plist_t node, int32_t sec, int32_t usec) plist_set_element_val(node, PLIST_DATE, &val, sizeof(GTimeVal)); } -//DEPRECATED API BELOW - - -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 - plist_type node_type = plist_get_node_type(node); - if (node_type == PLIST_DICT || node_type == PLIST_ARRAY) - { - //only structured types are allowed to have nulll value - if (value || (!value && (type == PLIST_DICT || type == PLIST_ARRAY))) - { - - plist_t subnode = NULL; - - //now handle value - plist_data_t data = plist_new_plist_data(); - data->type = type; - data->length = length; - - switch (type) - { - case PLIST_BOOLEAN: - data->boolval = *((char *) value); - break; - case PLIST_UINT: - data->intval = *((uint64_t *) value); - break; - case PLIST_REAL: - data->realval = *((double *) value); - break; - case PLIST_KEY: - case PLIST_STRING: - data->strval = strdup((char *) value); - break; - case PLIST_DATA: - data->buff = (uint8_t *) malloc(length); - memcpy(data->buff, value, length); - break; - case PLIST_DATE: - data->timeval.tv_sec = ((GTimeVal *) value)->tv_sec; - data->timeval.tv_usec = ((GTimeVal *) value)->tv_usec; - break; - case PLIST_ARRAY: - case PLIST_DICT: - default: - break; - } - - subnode = plist_new_node(data); - if (node) - g_node_append(node, subnode); - return subnode; - } - else - return NULL; - } - return NULL; -} - - -plist_t plist_get_first_child(plist_t node) -{ - return (plist_t) g_node_first_child((GNode *) node); -} - -plist_t plist_get_next_sibling(plist_t node) -{ - return (plist_t) g_node_next_sibling((GNode *) node); -} - -plist_t plist_get_prev_sibling(plist_t node) -{ - return (plist_t) g_node_prev_sibling((GNode *) node); -} - -plist_t plist_get_array_nth_el(plist_t node, uint32_t n) -{ - plist_t ret = NULL; - if (node && PLIST_ARRAY == plist_get_node_type(node)) - { - uint32_t i = 0; - plist_t temp = plist_get_first_child(node); - - while (i <= n && temp) - { - if (i == n) - ret = temp; - temp = plist_get_next_sibling(temp); - i++; - } - } - return ret; -} - -plist_t plist_get_dict_el_from_key(plist_t node, const char *key) -{ - plist_t ret = NULL; - if (node && PLIST_DICT == plist_get_node_type(node)) - { - - plist_t key_node = plist_find_node_by_key(node, key); - ret = plist_get_next_sibling(key_node); - } - return ret; -} - -void plist_add_sub_node(plist_t node, plist_t subnode) -{ - if (node && subnode) - { - plist_type type = plist_get_node_type(node); - if (type == PLIST_DICT || type == PLIST_ARRAY) - g_node_append(node, subnode); - } -} - -void plist_add_sub_key_el(plist_t node, const char *val) -{ - plist_add_sub_element(node, PLIST_KEY, val, strlen(val)); -} - -void plist_add_sub_string_el(plist_t node, const char *val) -{ - plist_add_sub_element(node, PLIST_STRING, val, strlen(val)); -} - -void plist_add_sub_bool_el(plist_t node, uint8_t val) -{ - plist_add_sub_element(node, PLIST_BOOLEAN, &val, sizeof(uint8_t)); -} - -void plist_add_sub_uint_el(plist_t node, uint64_t val) -{ - plist_add_sub_element(node, PLIST_UINT, &val, sizeof(uint64_t)); -} - -void plist_add_sub_real_el(plist_t node, double val) -{ - plist_add_sub_element(node, PLIST_REAL, &val, sizeof(double)); -} - -void plist_add_sub_data_el(plist_t node, const char *val, uint64_t length) -{ - plist_add_sub_element(node, PLIST_DATA, val, length); -} - -void plist_add_sub_date_el(plist_t node, int32_t sec, int32_t usec) -{ - GTimeVal val = { sec, usec }; - plist_add_sub_element(node, PLIST_DATE, &val, sizeof(GTimeVal)); -} - -static plist_t plist_find_node(plist_t plist, plist_type type, const void *value, uint64_t length) -{ - plist_t current = NULL; - - if (!plist) - return NULL; - - 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); - - if (data->type == type && data->length == length && compare_node_value(type, data, value, length)) - { - return current; - } - if (data->type == PLIST_DICT || data->type == PLIST_ARRAY) - { - plist_t sub = plist_find_node(current, type, value, length); - if (sub) - return sub; - } - } - return NULL; -} - -plist_t plist_find_node_by_key(plist_t plist, const char *value) -{ - return plist_find_node(plist, PLIST_KEY, value, strlen(value)); -} - -plist_t plist_find_node_by_string(plist_t plist, const char *value) -{ - return plist_find_node(plist, PLIST_STRING, value, strlen(value)); -} - -- cgit v1.1-32-gdbae