~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/tree.c

  • Committer: Brian Aker
  • Date: 2008-10-06 06:47:29 UTC
  • Revision ID: brian@tangent.org-20081006064729-2i9mhjkzyvow9xsm
RemoveĀ uint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
181
181
    parent[0] = & parent[-1][0]->right
182
182
*/
183
183
 
184
 
TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size, 
 
184
TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint32_t key_size, 
185
185
                          void* custom_arg)
186
186
{
187
187
  int cmp;
206
206
  }
207
207
  if (element == &tree->null_element)
208
208
  {
209
 
    uint alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
 
209
    uint32_t alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
210
210
    tree->allocated+=alloc_size;
211
211
 
212
212
    if (tree->memory_limit && tree->elements_in_tree
253
253
  return element;
254
254
}
255
255
 
256
 
int tree_delete(TREE *tree, void *key, uint key_size, void *custom_arg)
 
256
int tree_delete(TREE *tree, void *key, uint32_t key_size, void *custom_arg)
257
257
{
258
258
  int cmp,remove_colour;
259
259
  TREE_ELEMENT *element,***parent, ***org_parent, *nod;