X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=e8514879c1e8ba43ad5af1ec89791a09452357e0;hp=4ea2f94bf469aa177f0803fccc2a1218d0b25907;hb=eabf5255d29d62b4fa89492d40830b0213831f07;hpb=1426e3fcf927d6321fd2cf8595394f817bb1a0e2

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 4ea2f94..e851487 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -48,6 +48,7 @@ extern "C" {
 
 struct sdb_store_obj {
 	sdb_object_t super;
+#define _name super.name
 
 	/* object type */
 	int type;
@@ -66,17 +67,17 @@ typedef struct {
 	sdb_store_obj_t super;
 
 	sdb_data_t value;
-} sdb_attribute_t;
-#define ATTR(obj) ((sdb_attribute_t *)(obj))
-#define CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
+} attr_t;
+#define ATTR(obj) ((attr_t *)(obj))
+#define CONST_ATTR(obj) ((const attr_t *)(obj))
 
 typedef struct {
 	sdb_store_obj_t super;
 
 	sdb_avltree_t *attributes;
-} sdb_service_t;
-#define SVC(obj) ((sdb_service_t *)(obj))
-#define CONST_SVC(obj) ((const sdb_service_t *)(obj))
+} service_t;
+#define SVC(obj) ((service_t *)(obj))
+#define CONST_SVC(obj) ((const service_t *)(obj))
 
 typedef struct {
 	sdb_store_obj_t super;
@@ -95,9 +96,9 @@ typedef struct {
 	sdb_avltree_t *services;
 	sdb_avltree_t *metrics;
 	sdb_avltree_t *attributes;
-} sdb_host_t;
-#define HOST(obj) ((sdb_host_t *)(obj))
-#define CONST_HOST(obj) ((const sdb_host_t *)(obj))
+} host_t;
+#define HOST(obj) ((host_t *)(obj))
+#define CONST_HOST(obj) ((const host_t *)(obj))
 
 /* shortcuts for accessing service/host attributes */
 #define _last_update super.last_update
@@ -160,7 +161,6 @@ enum {
 	MATCHER_ANY,
 	MATCHER_ALL,
 	MATCHER_IN,
-	MATCHER_NIN,
 
 	/* unary operators */
 	MATCHER_ISNULL,
@@ -188,7 +188,6 @@ enum {
 		: ((t) == MATCHER_ANY) ? "ANY" \
 		: ((t) == MATCHER_ALL) ? "ALL" \
 		: ((t) == MATCHER_IN) ? "IN" \
-		: ((t) == MATCHER_NIN) ? "NOT IN" \
 		: ((t) == MATCHER_ISNULL) ? "IS NULL" \
 		: ((t) == MATCHER_ISTRUE) ? "IS TRUE" \
 		: ((t) == MATCHER_ISFALSE) ? "IS FALSE" \