X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=cbd5f0c05595ccdca54ce2dba48b02d386fed972;hb=1905dca54fb53caed8171da2fcb842afc9f33216;hp=e5cd886aae31be9bb1d35be92e9f42b7d729e4b5;hpb=bef7167f0dc1fd405e35d5cbffb3c0820945a9ea;p=sysdb.git diff --git a/src/core/store.c b/src/core/store.c index e5cd886..cbd5f0c 100644 --- a/src/core/store.c +++ b/src/core/store.c @@ -197,33 +197,33 @@ sdb_host_create(const char *name) sdb_host_t * sdb_host_clone(const sdb_host_t *host) { - sdb_host_t *clone; + sdb_host_t *new; - clone = sdb_host_create(host->host_name); - if (! clone) + new = sdb_host_create(host->host_name); + if (! new) return NULL; /* make sure these are initialized; else sdb_object_deref() might access * arbitrary memory in case of an error */ - clone->services = clone->attributes = NULL; + new->services = new->attributes = NULL; if (host->attributes) { - clone->attributes = sdb_llist_clone(host->attributes); - if (! clone->attributes) { - sdb_object_deref(SDB_OBJ(clone)); + new->attributes = sdb_llist_clone(host->attributes); + if (! new->attributes) { + sdb_object_deref(SDB_OBJ(new)); return NULL; } } - clone->host_last_update = host->host_last_update; + new->host_last_update = host->host_last_update; if (host->services) { - clone->services = sdb_llist_clone(host->services); - if (! clone->services) { - sdb_object_deref(SDB_OBJ(clone)); + new->services = sdb_llist_clone(host->services); + if (! new->services) { + sdb_object_deref(SDB_OBJ(new)); return NULL; } } - return clone; + return new; } /* sdb_host_clone */ int @@ -350,15 +350,15 @@ sdb_attribute_create(const char *hostname, sdb_attribute_t * sdb_attribute_clone(const sdb_attribute_t *attr) { - sdb_attribute_t *clone; + sdb_attribute_t *new; - clone = sdb_attribute_create(attr->hostname, + new = sdb_attribute_create(attr->hostname, attr->attr_name, attr->attr_value); - if (! clone) + if (! new) return NULL; - clone->attr_last_update = attr->attr_last_update; - return clone; + new->attr_last_update = attr->attr_last_update; + return new; } /* sdb_attribute_clone */ int @@ -450,14 +450,14 @@ sdb_service_create(const char *hostname, const char *name) sdb_service_t * sdb_service_clone(const sdb_service_t *svc) { - sdb_service_t *clone; + sdb_service_t *new; - clone = sdb_service_create(svc->hostname, svc->svc_name); - if (! clone) + new = sdb_service_create(svc->hostname, svc->svc_name); + if (! new) return NULL; - clone->svc_last_update = svc->svc_last_update; - return clone; + new->svc_last_update = svc->svc_last_update; + return new; } /* sdb_service_clone */ int