![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index 77dae0e18e7488f4c95ab578ec9748bbd6978565..43a7a6bda20d1228f8fa6b389a5c9710d92936a2 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
sdb_object_deref(SDB_OBJ(sobj->parent));
} /* store_obj_destroy */
-/* this may not be used as a type on its own but only as helper functions for
- * the derived types; the function accepts a variadic list of arguments to
- * pass to the sub-type's init function */
-static sdb_object_t *
-store_obj_clone(const sdb_object_t *obj, ...)
-{
- const store_obj_t *sobj = STORE_CONST_OBJ(obj);
- store_obj_t *new;
-
- va_list ap;
-
- va_start(ap, obj);
-
- new = STORE_OBJ(sdb_object_vcreate(obj->name, obj->type, ap));
- va_end(ap);
- if (! new)
- return NULL;
-
- new->last_update = sobj->last_update;
- sdb_object_ref(SDB_OBJ(sobj->parent));
- new->parent = sobj->parent;
- return SDB_OBJ(new);
-} /* store_obj_clone */
-
static int
sdb_store_obj_init(sdb_object_t *obj, va_list ap)
{
sdb_llist_destroy(sobj->attributes);
} /* sdb_store_obj_destroy */
-static sdb_object_t *
-sdb_store_obj_clone(const sdb_object_t *obj)
-{
- const sdb_store_obj_t *sobj = SDB_CONST_STORE_OBJ(obj);
- sdb_store_obj_t *new;
-
- new = SDB_STORE_OBJ(store_obj_clone(obj, sobj->_last_update, sobj->type));
- if (! new)
- return NULL;
-
- if (sobj->children) {
- sdb_llist_destroy(new->children);
- new->children = sdb_llist_clone(sobj->children);
- if (! new->children) {
- sdb_object_deref(SDB_OBJ(new));
- return NULL;
- }
- }
- if (sobj->attributes) {
- sdb_llist_destroy(new->attributes);
- new->attributes = sdb_llist_clone(sobj->attributes);
- if (! new->attributes) {
- sdb_object_deref(SDB_OBJ(new));
- return NULL;
- }
- }
-
- return SDB_OBJ(new);
-} /* sdb_store_obj_clone */
-
static int
sdb_attr_init(sdb_object_t *obj, va_list ap)
{
return ret;
value = va_arg(ap, const char *);
- SDB_ATTR(obj)->value = strdup(value);
- if (! SDB_ATTR(obj)->value)
- return -1;
+ if (value) {
+ SDB_ATTR(obj)->value = strdup(value);
+ if (! SDB_ATTR(obj)->value)
+ return -1;
+ }
return 0;
} /* sdb_attr_init */
free(SDB_ATTR(obj)->value);
} /* sdb_attr_destroy */
-static sdb_object_t *
-sdb_attr_clone(const sdb_object_t *obj)
-{
- const sdb_attribute_t *attr = (const sdb_attribute_t *)obj;
- sdb_attribute_t *new;
-
- new = SDB_ATTR(store_obj_clone(obj, attr->_last_update, attr->value));
- if (! new)
- return NULL;
- return SDB_OBJ(new);
-} /* sdb_attr_clone */
-
static sdb_type_t sdb_store_obj_type = {
sizeof(sdb_store_obj_t),
sdb_store_obj_init,
- sdb_store_obj_destroy,
- sdb_store_obj_clone
+ sdb_store_obj_destroy
};
static sdb_type_t sdb_attribute_type = {
sizeof(sdb_attribute_t),
sdb_attr_init,
- sdb_attr_destroy,
- sdb_attr_clone
+ sdb_attr_destroy
};
/*
int type, const char *name, sdb_time_t last_update,
store_obj_t **updated_obj)
{
+ char *parent_cname = NULL, *cname = NULL;
+
sdb_llist_t *parent_list;
store_obj_t *old;
int status = 0;
- if (! name)
- return -1;
-
if (last_update <= 0)
last_update = sdb_gettime();
|| (type == SDB_SERVICE)
|| (type == SDB_ATTRIBUTE));
+ if (parent_type == SDB_HOST) {
+ parent_cname = sdb_plugin_cname(strdup(parent_name));
+ if (! parent_cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
+ }
+ parent_name = parent_cname;
+ }
+ if (type == SDB_HOST) {
+ cname = sdb_plugin_cname(strdup(name));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
+ }
+ name = cname;
+ }
if (! obj_list) {
- if (! (obj_list = sdb_llist_create()))
+ if (! (obj_list = sdb_llist_create())) {
+ free(parent_cname);
+ free(cname);
return -1;
+ }
}
parent_list = obj_list;
sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
"parent %s '%s' not found", TYPE_TO_NAME(type), name,
TYPE_TO_NAME(parent_type), parent_name);
+ free(parent_cname);
+ free(cname);
return -1;
}
sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
TYPE_TO_NAME(type), name,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ free(parent_cname);
+ free(cname);
return -1;
}
if (updated_obj)
*updated_obj = new;
}
+ free(parent_cname);
+ free(cname);
return status;
} /* sdb_store_obj */
int
sdb_store_host(const char *name, sdb_time_t last_update)
{
- char *cname;
int status;
if (! name)
return -1;
- cname = sdb_plugin_cname(strdup(name));
- if (! cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- return -1;
- }
-
pthread_rwlock_wrlock(&obj_lock);
status = store_obj(/* parent = */ 0, NULL,
- /* stored object = */ SDB_HOST, cname, last_update,
+ /* stored object = */ SDB_HOST, name, last_update,
/* updated_obj = */ NULL);
pthread_rwlock_unlock(&obj_lock);
- free(cname);
return status;
} /* sdb_store_host */
sdb_store_attribute(const char *hostname, const char *key, const char *value,
sdb_time_t last_update)
{
- char *cname;
int status;
store_obj_t *updated_attr = NULL;
if ((! hostname) || (! key))
return -1;
- cname = sdb_plugin_cname(strdup(hostname));
- if (! cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- return -1;
- }
-
pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* parent = */ SDB_HOST, cname,
+ status = store_obj(/* parent = */ SDB_HOST, hostname,
/* stored object = */ SDB_ATTRIBUTE, key, last_update,
&updated_attr);
status = -1;
}
pthread_rwlock_unlock(&obj_lock);
- free(cname);
return status;
} /* sdb_store_attribute */
sdb_store_service(const char *hostname, const char *name,
sdb_time_t last_update)
{
- char *cname;
int status;
if ((! hostname) || (! name))
return -1;
- cname = sdb_plugin_cname(strdup(hostname));
- if (! cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- return -1;
- }
-
pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* parent = */ SDB_HOST, cname,
+ status = store_obj(/* parent = */ SDB_HOST, hostname,
/* stored object = */ SDB_SERVICE, name, last_update,
/* updated obj = */ NULL);
pthread_rwlock_unlock(&obj_lock);
- free(cname);
return status;
} /* sdb_store_service */