scanner and security enforcer rebase developdev-scanner

1 files changed, 14 insertions, 30 deletions

diff --git a/scanner/attribute_kv.c b/scanner/attribute_kv.c
index 749521f..111c0bd 100644
--- a/scanner/attribute_kv.c
+++ b/scanner/attribute_kv.c
@@ -8,7 +8,7 @@
 struct attribute_kv
 {
 	int magic;
-	struct kv *attr_kv[ATTRIBUTE_KV_MAX];
+	struct utable_kv *attr_kv[ATTRIBUTE_KV_MAX];
 };
 
 struct attribute_kv *attribute_kv_new(void)
@@ -35,12 +35,12 @@ void attribute_kv_free(struct attribute_kv *attr)
 			FREE(attr->attr_kv[i]->key);
 		}
 
-		switch(attr->attr_kv[i]->type)
+		switch(attr->attr_kv[i]->value_type)
 		{
-			case VTYPE_CSTRING:
-				if(attr->attr_kv[i]->value_str.str!=NULL)
+			case utable_value_type_cstring:
+				if(attr->attr_kv[i]->cstring!=NULL)
 				{
-					FREE(attr->attr_kv[i]->value_str.str);
+					FREE(attr->attr_kv[i]->cstring);
 				}
 				break;
 			default:
@@ -51,22 +51,6 @@ void attribute_kv_free(struct attribute_kv *attr)
 	FREE(attr);
 }
 
-void attribute_kv_set_uuid(struct attribute_kv *attr, enum ATTRIBUTE_KV_INDEX index, const char *key, size_t key_sz, uuid_t uuid)
-{
-	if(attr==NULL || index>=ATTRIBUTE_KV_MAX || index<=ATTRIBUTE_KV_UNKNOWN || key==NULL || key_sz==0)
-	{
-		return;
-	}
-
-	struct kv *kv=(struct kv *)CALLOC(struct kv, 1);
-	kv->key=strndup(key, key_sz);
-	kv->key_sz=key_sz;
-	kv->type=VTYPE_UUID;
-	memcpy(kv->value_uuid, uuid, sizeof(uuid_t));
-
-	attr->attr_kv[index]=kv;
-}
-
 void attribute_kv_set_integer(struct attribute_kv *attr, enum ATTRIBUTE_KV_INDEX index, const char *key, size_t key_sz, long long value)
 {
 	if(attr==NULL || index>=ATTRIBUTE_KV_MAX || index<=ATTRIBUTE_KV_UNKNOWN || key==NULL || key_sz==0)
@@ -74,11 +58,11 @@ void attribute_kv_set_integer(struct attribute_kv *attr, enum ATTRIBUTE_KV_INDEX
 		return;
 	}
 
-	struct kv *kv=(struct kv *)CALLOC(struct kv, 1);
+	struct utable_kv *kv=(struct utable_kv *)CALLOC(struct utable_kv, 1);
 	kv->key=strndup(key, key_sz);
 	kv->key_sz=key_sz;
-	kv->type=VTYPE_INTEGER;
-	kv->value_longlong=value;
+	kv->value_type=utable_value_type_integer;
+	kv->integer=value;
 
 	attr->attr_kv[index]=kv;
 }
@@ -90,22 +74,22 @@ void attribute_kv_set_string(struct attribute_kv *attr, enum ATTRIBUTE_KV_INDEX
 		return;
 	}
 
-	struct kv *kv=(struct kv *)CALLOC(struct kv, 1);
+	struct utable_kv *kv=(struct utable_kv *)CALLOC(struct utable_kv, 1);
 	kv->key=strndup(key, key_sz);
 	kv->key_sz=key_sz;
-	kv->type=VTYPE_CSTRING;
-	kv->value_str.str=strndup(value, value_sz);
-	kv->value_str.sz=value_sz;
+	kv->value_type=utable_value_type_cstring;
+	kv->cstring=strndup(value, value_sz);
+	kv->cstring_sz=value_sz;
 
 	attr->attr_kv[index]=kv;
 }
 
-const struct kv *attribute_kv_get(struct attribute_kv *attr, enum ATTRIBUTE_KV_INDEX index)
+const struct utable_kv *attribute_kv_get(struct attribute_kv *attr, enum ATTRIBUTE_KV_INDEX index)
 {
 	if(attr==NULL || index>=ATTRIBUTE_KV_MAX || index<=ATTRIBUTE_KV_UNKNOWN)
 	{
 		return NULL;
 	}
 
-	return (const struct kv *)(attr->attr_kv[index]);
+	return (const struct utable_kv *)(attr->attr_kv[index]);
 }
\ No newline at end of file