libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace glibc tsearch() with a custom red-black tree implementation.

Browse Source 
The library supplied tree estructure is not enought for our needs, due to its
limited API. Thus, we have implemented a suitable red-black tree.
This commit is contained in:
Vreixo Formoso
2007-12-20 00:25:25 +01:00
parent 5eb3a7e038
commit e6bd1586d6
9 changed files with 422 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/filesrc.c
View File

@ -9,15 +9,11 @@
#include "filesrc.h"
#include "error.h"
#include "node.h"
#include "util.h"
#include <stdlib.h>
/* tdestroy is a GNU specific function */
#define __USE_GNU
#include <search.h>
static
int comp_iso_file_src(const void *n1, const void *n2)
int iso_file_src_cmp(const void *n1, const void *n2)
{
const IsoFileSrc *f1, *f2;
int res;
@ -25,7 +21,6 @@ int comp_iso_file_src(const void *n1, const void *n2)
dev_t dev_id1, dev_id2;
ino_t ino_id1, ino_id2;
f1 = (const IsoFileSrc *)n1;
f2 = (const IsoFileSrc *)n2;
@ -76,7 +71,7 @@ int iso_file_src_create(Ecma119Image *img, IsoFile *file, IsoFileSrc **src)
// care of it
return ISO_ERROR;
} else {
IsoFileSrc **inserted;
int ret;
fsrc = malloc(sizeof(IsoFileSrc));
if (fsrc == NULL) {
@ -90,32 +85,18 @@ int iso_file_src_create(Ecma119Image *img, IsoFile *file, IsoFileSrc **src)
fsrc->stream = file->stream;
/* insert the filesrc in the tree */
inserted = tsearch(fsrc, &(img->file_srcs), comp_iso_file_src);
if (inserted == NULL) {
free(fsrc);
return ISO_MEM_ERROR;
} else if (*inserted == fsrc) {
/* the file was inserted */
img->file_count++;
} else {
/* the file was already on the tree */
ret = iso_rbtree_insert(img->files, fsrc, (void**)src);
if (ret <= 0) {
free(fsrc);
return ret;
}
*src = *inserted;
}
return ISO_SUCCESS;
}
void free_node(void *nodep)
void iso_file_src_free(void *node)
{
/* nothing to do */
}
void iso_file_src_free(Ecma119Image *img)
{
if (img->file_srcs != NULL) {
tdestroy(img->file_srcs, free_node);
}
free(node);
}
off_t iso_file_src_get_size(IsoFileSrc *file)