Index: trunk/archive/pslib/src/Metadata/metadata.c =================================================================== --- trunk/archive/pslib/src/Metadata/metadata.c (revision 164) +++ trunk/archive/pslib/src/Metadata/metadata.c (revision 446) @@ -6,6 +6,6 @@ #include #include -#include "psUtils.h" -#include "psMetaData.h" +#include "psLib.h" +#include "psMetadata.h" /*****************************************************************************/ @@ -13,15 +13,15 @@ * Handle sets of metadata */ -psMetaDataSet *psMetaDataSetAlloc(void) // make a new set of metadata -{ - psMetaDataSet *ms = psAlloc(sizeof(psMetaDataSet)); +psMetadata *psMetadataAlloc(void) // make a new set of metadata +{ + psMetadata *ms = psAlloc(sizeof(psMetadata)); ms->list = psDlistAlloc(NULL); // list of metadata - ms->table = psHashAlloc(128); // hash table + ms->table = psHashAlloc(); // hash table return ms; } -void psMetaDataSetFree(psMetaDataSet *ms) // destroy a set of metadata +void psMetadataFree(psMetadata *ms) // destroy a set of metadata { if (ms == NULL) { @@ -30,5 +30,5 @@ psDlistFree(ms->list, (void (*)(void *))NULL); - psHashFree(ms->table, (void (*)(void *))psMetaDataItemFree); + psHashFree(ms->table, (void (*)(void *))psMetadataItemFree); psFree(ms); @@ -37,5 +37,5 @@ /*****************************************************************************/ /* - * Return a properly filled-out psMetaDataItem + * Return a properly filled-out psMetadataItem * * N.b. For types PS_META_FLOAT, PS_META_INT, and PS_META_STR, a COPY @@ -43,5 +43,5 @@ * to the data will be kept. */ -psMetaDataItem *psMetaDataItemAlloc( +psMetadataItem *psMetadataItemAlloc( int typeFlags, // type of this piece of metadata + flags const void *data, // value of new item @@ -51,8 +51,8 @@ ) { - const psMetaDataType type = typeFlags & PS_META_TYPE_MASK; // the type part of typeFlags - psMetaDataFlags flags = typeFlags & ~PS_META_TYPE_MASK; // the flags part of typeFlags + const psMetadataType type = typeFlags & PS_META_TYPE_MASK; // the type part of typeFlags + psMetadataFlags flags = typeFlags & ~PS_META_TYPE_MASK; // the flags part of typeFlags static int id = 0; // unique ID for an item of metadata - psMetaDataItem *ms = psAlloc(sizeof(psMetaDataItem)); + psMetadataItem *ms = psAlloc(sizeof(psMetadataItem)); *(int *)&ms->id = id++; // need to cast away const @@ -125,5 +125,5 @@ } -void psMetaDataItemFree(psMetaDataItem *ms) // piece of metadata to destroy +void psMetadataItemFree(psMetadataItem *ms) // piece of metadata to destroy { if(ms == NULL) { @@ -167,9 +167,9 @@ /*****************************************************************************/ /* - * Add an new psMetaDataItem to a psMetaDataSet - */ -psMetaDataItem *psMetaDataAppend(psMetaDataSet *restrict ms, psMetaDataItem *restrict item) -{ - psMetaDataItem *meta = NULL; // an item of metadata + * Add an new psMetadataItem to a psMetadata + */ +psMetadataItem *psMetadataAppend(psMetadata *restrict ms, psMetadataItem *restrict item) +{ + psMetadataItem *meta = NULL; // an item of metadata assert (ms != NULL && ms->list != NULL && ms->table != NULL); @@ -178,7 +178,7 @@ if (item->flags & PS_META_NON_UNIQUE) { - psMetaDataItem *head = meta; + psMetadataItem *head = meta; if (head == NULL) { // this is the first item of this name - head = psMetaDataAppend(ms, psMetaDataItemAlloc(PS_META_ITEM_SET, NULL, NULL, item->name)); + head = psMetadataAppend(ms, psMetadataItemAlloc(PS_META_ITEM_SET, NULL, NULL, item->name)); } @@ -202,10 +202,11 @@ psDlistAppend(head->items, item); - psHashInsert(ms->table, item->name, item, (void (*)(void *))psMetaDataItemFree); + psHashInsert(ms->table, item->name, item, (void (*)(void *))psMetadataItemFree); return item; } else if (meta != NULL) { - psError(__func__, "Key \"%s\" is already present in the metaDataSet 0x%x", item->name, ms); - //psMetaDataItemFree(item); + psError(__func__, PS_ERR_UNKNOWN, PS_NEW_ERROR, + "Key \"%s\" is already present in the metaDataSet 0x%x", item->name, ms); + //psMetadataItemFree(item); return NULL; @@ -213,5 +214,5 @@ psDlistAppend(ms->list, item); - psHashInsert(ms->table, item->name, item, (void (*)(void *))psMetaDataItemFree); + psHashInsert(ms->table, item->name, item, (void (*)(void *))psMetadataItemFree); return item; @@ -222,9 +223,9 @@ * Remove and return an item of metadata from a set */ -psMetaDataItem *psMetaDataRemove(psMetaDataSet *restrict ms, const char *restrict key) +psMetadataItem *psMetadataRemove(psMetadata *restrict ms, const char *restrict key) { assert (ms != NULL && ms->list != NULL && ms->table != NULL); - psMetaDataItem *meta = psHashRemove(ms->table, key); + psMetadataItem *meta = psHashRemove(ms->table, key); if (meta == NULL) { @@ -239,5 +240,5 @@ *ptr = '\0'; - psMetaDataItem *base = psHashLookup(ms->table, baseKey); // here's the non-qualified metadata + psMetadataItem *base = psHashLookup(ms->table, baseKey); // here's the non-qualified metadata assert (base != NULL); @@ -253,5 +254,5 @@ * Iterators for the psDlist representation of the metadata */ -void psMetaDataSetIterator(psMetaDataSet *ms) +void psMetadataIterator(psMetadata *ms) { assert (ms != NULL); @@ -259,9 +260,9 @@ } -psMetaDataItem *psMetaDataGetNext(psMetaDataSet *restrict ms, +psMetadataItem *psMetadataGetNext(psMetadata *restrict ms, const char *restrict match) { assert (ms != NULL); - psMetaDataItem *meta = psDlistGetNext(ms->list, 0); + psMetadataItem *meta = psDlistGetNext(ms->list, 0); if (match == NULL || meta == NULL) { @@ -271,5 +272,5 @@ return meta; } else { - return psMetaDataGetNext(ms, match); + return psMetadataGetNext(ms, match); } } @@ -280,5 +281,5 @@ * Access using the hash table */ -psMetaDataItem *psMetaDataLookup(const psMetaDataSet *restrict ms, +psMetadataItem *psMetadataLookup(const psMetadata *restrict ms, const char *restrict key) { @@ -289,6 +290,6 @@ /*****************************************************************************/ -void psMetaDataItemPrint(FILE *fd, // file descriptor to write to - const psMetaDataItem *restrict ms, // item of metadata to print +void psMetadataItemPrint(FILE *fd, // file descriptor to write to + const psMetadataItem *restrict ms, // item of metadata to print const char *prefix) // print this at the beginning of each line { @@ -308,10 +309,10 @@ case PS_META_ITEM_SET: { // gcc 3.3 doesn't allow a declaration here - psMetaDataItem *meta = NULL; + psMetadataItem *meta = NULL; fprintf(fd, "\n"); psDlistSetIterator(ms->items, PS_DLIST_HEAD, 0); while ((meta = psDlistGetNext(ms->items, 0)) != NULL) { - psMetaDataItemPrint(fd, meta, "\t"); + psMetadataItemPrint(fd, meta, "\t"); } } @@ -369,38 +370,38 @@ psSetLogFormat("NM"); // suppress some of the psLogMsg verbosity - psMetaDataSet *ms = psMetaDataSetAlloc(); // set of metadata - psMetaDataItem *meta = NULL; // used to traverse a set of metadata + psMetadata *ms = psMetadataAlloc(); // set of metadata + psMetadataItem *meta = NULL; // used to traverse a set of metadata for (int i = 0; i < 10; i += 5) { float sqrti = sqrt(i); - psMetaDataAppend(ms, psMetaDataItemAlloc(PS_META_INT, &i, NULL, "const.%d", i)); - psMetaDataAppend(ms, psMetaDataItemAlloc(PS_META_FLOAT, &sqrti, "square root", "const.sqrt%d", i)); - } - psMetaDataAppend(ms, psMetaDataItemAlloc(PS_META_STR | PS_META_NON_UNIQUE, + psMetadataAppend(ms, psMetadataItemAlloc(PS_META_INT, &i, NULL, "const.%d", i)); + psMetadataAppend(ms, psMetadataItemAlloc(PS_META_FLOAT, &sqrti, "square root", "const.sqrt%d", i)); + } + psMetadataAppend(ms, psMetadataItemAlloc(PS_META_STR | PS_META_NON_UNIQUE, "Bonjour", "French", "lang.hello")); - psMetaDataAppend(ms, psMetaDataItemAlloc(PS_META_STR | PS_META_NON_UNIQUE, + psMetadataAppend(ms, psMetadataItemAlloc(PS_META_STR | PS_META_NON_UNIQUE, "Aloha", "Hawaiian", "lang.hello")); - psMetaDataAppend(ms, psMetaDataItemAlloc(PS_META_STR | PS_META_NON_UNIQUE, + psMetadataAppend(ms, psMetadataItemAlloc(PS_META_STR | PS_META_NON_UNIQUE, "Good Morning", "English", "lang.hello")); /* * Print all metadata starting "lang" */ - psMetaDataItemFree(psMetaDataRemove(ms, "lang.hello.0")); - - psMetaDataSetIterator(ms); - while ((meta = psMetaDataGetNext(ms, "lang")) != NULL) { - psMetaDataItemPrint(stdout, meta, ""); + psMetadataItemFree(psMetadataRemove(ms, "lang.hello.0")); + + psMetadataIterator(ms); + while ((meta = psMetadataGetNext(ms, "lang")) != NULL) { + psMetadataItemPrint(stdout, meta, ""); } /* * Remove a key */ - psMetaDataItemFree(psMetaDataRemove(ms, "lang.hello")); + psMetadataItemFree(psMetadataRemove(ms, "lang.hello")); /* * Print all metadata */ fprintf(stdout, "------\n"); - psMetaDataSetIterator(ms); - while ((meta = psMetaDataGetNext(ms, NULL)) != NULL) { - psMetaDataItemPrint(stdout, meta, ""); + psMetadataIterator(ms); + while ((meta = psMetadataGetNext(ms, NULL)) != NULL) { + psMetadataItemPrint(stdout, meta, ""); } /* @@ -409,12 +410,12 @@ fprintf(stdout, "------\n"); fprintf(stdout, "Looking up by name:\n"); - meta = psMetaDataLookup(ms, "const.5"); + meta = psMetadataLookup(ms, "const.5"); if (meta != NULL) { - psMetaDataItemPrint(stdout, meta, ""); + psMetadataItemPrint(stdout, meta, ""); } /* * Clean up */ - psMetaDataSetFree(ms); + psMetadataFree(ms); /* * Check for memory leaks