Index: build_run.c =================================================================== --- build_run.c (revision 24270) +++ build_run.c (revision 24271) @@ -30,7 +30,6 @@ #include "config.h" #include -#include #include #include "conf_core.h" #include "board.h" @@ -256,129 +255,3 @@ pcb_message(PCB_MSG_ERROR, "aborted by %s signal\n", s); exit(1); } - - -/*** files loaded ***/ - -htsp_t pcb_file_loaded; - - -pcb_file_loaded_t *pcb_file_loaded_category(const char *name, int alloc) -{ - pcb_file_loaded_t *cat = htsp_get(&pcb_file_loaded, name); - - if ((cat == NULL) && (alloc)) { - cat = calloc(sizeof(pcb_file_loaded_t), 1); - cat->type = PCB_FLT_CATEGORY; - cat->name = pcb_strdup(name); - htsp_init(&cat->data.category.children, strhash, strkeyeq); - htsp_set(&pcb_file_loaded, cat->name, cat); - } - return cat; -} - -int pcb_file_loaded_file_free(pcb_file_loaded_t *file) -{ - free(file->data.file.path); - free(file->data.file.desc); - free(file->name); - free(file); - return 0; -} - -int pcb_file_loaded_clear(pcb_file_loaded_t *cat) -{ - htsp_entry_t *e; - - assert(cat->type == PCB_FLT_CATEGORY); - - for (e = htsp_first(&cat->data.category.children); e; e = htsp_next(&cat->data.category.children, e)) { - pcb_file_loaded_file_free(e->value); - htsp_delentry(&cat->data.category.children, e); - } - return 0; -} - -int pcb_file_loaded_clear_at(const char *catname) -{ - pcb_file_loaded_t *cat = pcb_file_loaded_category(catname, 0); - if (cat != NULL) - return pcb_file_loaded_clear(cat); - return 0; -} - -int pcb_file_loaded_set(pcb_file_loaded_t *cat, const char *name, const char *path, const char *desc) -{ - pcb_file_loaded_t *file; - - assert(cat->type == PCB_FLT_CATEGORY); - file = htsp_get(&cat->data.category.children, name); - if (file != NULL) { - free(file->data.file.path); - free(file->data.file.desc); - } - else { - file = malloc(sizeof(pcb_file_loaded_t)); - file->type = PCB_FLT_FILE; - file->name = pcb_strdup(name); - htsp_set(&cat->data.category.children, file->name, file); - } - if (path != NULL) - file->data.file.path = pcb_strdup(path); - else - file->data.file.path = NULL; - - if (desc != NULL) - file->data.file.desc = pcb_strdup(desc); - else - file->data.file.desc = NULL; - return 0; -} - -int pcb_file_loaded_set_at(const char *catnam, const char *name, const char *path, const char *desc) -{ - pcb_file_loaded_t *cat = pcb_file_loaded_category(catnam, 1); - return pcb_file_loaded_set(cat, name, path, desc); -} - -int pcb_file_loaded_del(pcb_file_loaded_t *cat, const char *name) -{ - pcb_file_loaded_t *file; - assert(cat->type == PCB_FLT_CATEGORY); - file = htsp_pop(&cat->data.category.children, name); - if (file != NULL) { - if (file->type != PCB_FLT_FILE) - return -1; - pcb_file_loaded_file_free(file); - } - return 0; -} - -int pcb_file_loaded_del_at(const char *catname, const char *name) -{ - pcb_file_loaded_t *cat = pcb_file_loaded_category(catname, 1); - return pcb_file_loaded_del(cat, name); -} - -void pcb_file_loaded_init(void) -{ - htsp_init(&pcb_file_loaded, strhash, strkeyeq); -} - -void pcb_file_loaded_uninit(void) -{ - htsp_entry_t *e; - - for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e)) { - pcb_file_loaded_t *cat = e->value; - pcb_file_loaded_clear(cat); - free(cat->name); - htsp_uninit(&cat->data.category.children); - free(cat); - htsp_delentry(&pcb_file_loaded, e); - } - - htsp_uninit(&pcb_file_loaded); -} - -