diff options
Diffstat (limited to 'src/libmowgli/object/metadata.c')
| -rw-r--r-- | src/libmowgli/object/metadata.c | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/libmowgli/object/metadata.c b/src/libmowgli/object/metadata.c index 742e0dc..307947e 100644 --- a/src/libmowgli/object/metadata.c +++ b/src/libmowgli/object/metadata.c @@ -23,17 +23,15 @@ #include "mowgli.h" -void mowgli_object_metadata_associate(mowgli_object_t *self, const char *key, void *value) +void +mowgli_object_metadata_associate(mowgli_object_t *self, const char *key, void *value) { + return_if_fail(self != NULL); + return_if_fail(key != NULL); + mowgli_object_metadata_entry_t *e = NULL; mowgli_node_t *n; - if (self == NULL) - mowgli_throw_exception(mowgli.object_metadata.invalid_object_exception); - - if (key == NULL) - mowgli_throw_exception(mowgli.null_pointer_exception); - MOWGLI_LIST_FOREACH(n, self->metadata.head) { e = (mowgli_object_metadata_entry_t *) n->data; @@ -55,17 +53,15 @@ void mowgli_object_metadata_associate(mowgli_object_t *self, const char *key, vo mowgli_node_add(e, mowgli_node_create(), &self->metadata); } -void mowgli_object_metadata_dissociate(mowgli_object_t *self, const char *key) +void +mowgli_object_metadata_dissociate(mowgli_object_t *self, const char *key) { + return_if_fail(self != NULL); + return_if_fail(key != NULL); + mowgli_object_metadata_entry_t *e; mowgli_node_t *n, *tn; - if (self == NULL) - mowgli_throw_exception(mowgli.object_metadata.invalid_object_exception); - - if (key == NULL) - mowgli_throw_exception(mowgli.null_pointer_exception); - MOWGLI_LIST_FOREACH_SAFE(n, tn, self->metadata.head) { e = (mowgli_object_metadata_entry_t *) n->data; @@ -81,17 +77,15 @@ void mowgli_object_metadata_dissociate(mowgli_object_t *self, const char *key) } } -void *mowgli_object_metadata_retrieve(mowgli_object_t *self, const char *key) +void * +mowgli_object_metadata_retrieve(mowgli_object_t *self, const char *key) { + return_null_if_fail(self != NULL); + return_null_if_fail(key != NULL); + mowgli_object_metadata_entry_t *e; mowgli_node_t *n; - if (self == NULL) - mowgli_throw_exception_val(mowgli.object_metadata.invalid_object_exception, NULL); - - if (key == NULL) - mowgli_throw_exception_val(mowgli.null_pointer_exception, NULL); - MOWGLI_LIST_FOREACH(n, self->metadata.head) { e = (mowgli_object_metadata_entry_t *) n->data; |