diff options
Diffstat (limited to 'amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c')
| -rw-r--r-- | amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c b/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c index cb18f16a..aca99fe4 100644 --- a/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c +++ b/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c @@ -6,9 +6,9 @@ void *tst_delete(unsigned char *key, struct tst *tst) { struct node *current_node; - struct node *current_node_parent; + struct node *current_node_tqparent; struct node *last_branch; - struct node *last_branch_parent; + struct node *last_branch_tqparent; struct node *next_node; struct node *last_branch_replacement; struct node *last_branch_dangling_child; @@ -21,9 +21,9 @@ void *tst_delete(unsigned char *key, struct tst *tst) return NULL; last_branch = NULL; - last_branch_parent = NULL; + last_branch_tqparent = NULL; current_node = tst->head[(int)key[0]]; - current_node_parent = NULL; + current_node_tqparent = NULL; key_index = 1; while(current_node != NULL) { @@ -33,13 +33,13 @@ void *tst_delete(unsigned char *key, struct tst *tst) if( (current_node->left != NULL) || (current_node->right != NULL) ) { last_branch = current_node; - last_branch_parent = current_node_parent; + last_branch_tqparent = current_node_tqparent; } if(key[key_index] == 0) break; else { - current_node_parent = current_node; + current_node_tqparent = current_node; current_node = current_node->middle; key_index++; continue; @@ -49,16 +49,16 @@ void *tst_delete(unsigned char *key, struct tst *tst) ((current_node->value != 0) && (key[key_index] < current_node->value)) ) { - last_branch_parent = current_node; - current_node_parent = current_node; + last_branch_tqparent = current_node; + current_node_tqparent = current_node; current_node = current_node->left; last_branch = current_node; continue; } else { - last_branch_parent = current_node; - current_node_parent = current_node; + last_branch_tqparent = current_node; + current_node_tqparent = current_node; current_node = current_node->right; last_branch = current_node; continue; @@ -77,10 +77,10 @@ void *tst_delete(unsigned char *key, struct tst *tst) else if( (last_branch->left == NULL) && (last_branch->right == NULL) ) { - if(last_branch_parent->left == last_branch) - last_branch_parent->left = NULL; + if(last_branch_tqparent->left == last_branch) + last_branch_tqparent->left = NULL; else - last_branch_parent->right = NULL; + last_branch_tqparent->right = NULL; next_node = last_branch; } @@ -103,16 +103,16 @@ void *tst_delete(unsigned char *key, struct tst *tst) last_branch_dangling_child = NULL; } - if(last_branch_parent == NULL) + if(last_branch_tqparent == NULL) tst->head[(int)key[0]]=last_branch_replacement; else { - if (last_branch_parent->left == last_branch) - last_branch_parent->left = last_branch_replacement; - else if (last_branch_parent->right == last_branch) - last_branch_parent->right = last_branch_replacement; + if (last_branch_tqparent->left == last_branch) + last_branch_tqparent->left = last_branch_replacement; + else if (last_branch_tqparent->right == last_branch) + last_branch_tqparent->right = last_branch_replacement; else - last_branch_parent->middle = last_branch_replacement; + last_branch_tqparent->middle = last_branch_replacement; } if(last_branch_dangling_child != NULL) |