Remove reason's OID checking during serialization

Serialization function should not care about OIDs, because they depend
on database adapter. Reason's OID being zero does not neccessarily mean
the reason is not valid.

Change-Id: Icd792cf20d08099579735edf1362d16256243b44
Signed-off-by: Paweł Szewczyk <p.szewczyk@samsung.com>

diff --git a/src/event_types/action_executed_event.c b/src/event_types/action_executed_event.c
index 7a958124fbb618c94d6879d3a35513848392f9ea..4af8362a877ea968e7a0a0f5349120a4f71d9f9d 100644 (file)
--- a/src/event_types/action_executed_event.c
+++ b/src/event_types/action_executed_event.c
@@ -106,8 +106,6 @@ static void ae_event_serialize(struct faultd_event *ev, struct faultd_object *ou
        struct action_executed_event *ae_ev =
                to_action_executed_event(ev);
 
-       assert(!FAULTD_OID_IS_ZERO(ae_ev->reason->oid));
-
        faultd_event_serialize_internal(ev, out);
        faultd_object_append_oid(out, AE_EV_REASON, &ae_ev->reason->oid);
        faultd_object_append_string(out, AE_EV_ACTION, ae_ev->action);

diff --git a/src/event_types/decision_made_event.c b/src/event_types/decision_made_event.c
index d2a3d1722384bc67427b1dc189b9c6eebc3338ee..fafce4fe5eb8715e41db43fec68ed5a6e53972e5 100644 (file)
--- a/src/event_types/decision_made_event.c
+++ b/src/event_types/decision_made_event.c
@@ -99,8 +99,6 @@ static void dm_event_serialize(struct faultd_event *ev, struct faultd_object *ou
        struct decision_made_event *dm_ev =
                to_decision_made_event(ev);
 
-       assert(!FAULTD_OID_IS_ZERO(dm_ev->reason->oid));
-
        faultd_event_serialize_internal(ev, out);
        faultd_object_append_oid(out, DM_EV_REASON, &dm_ev->reason->oid);
        faultd_object_append_string(out, DM_EV_WHO, dm_ev->who_made);

diff --git a/src/util/common.h b/src/util/common.h
index 15b1ad24eceb87ff469e7509c8ba47fbeddde721..31a09072053556b8e3b1906f0603b9acef1e7d60 100644 (file)
--- a/src/util/common.h
+++ b/src/util/common.h
@@ -45,10 +45,6 @@
 
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(*a))
 
-#define BSON_OID_IS_ZERO(o) (o.ints[0] == 0 && \
-                                                        o.ints[1] == 0 && \
-                                                        o.ints[2] == 0)
-
 #ifndef offsetof
 #define offsetof(type, member)  __builtin_offsetof(type, member)
 #endif /* offsetof */
@@ -83,10 +79,6 @@ typedef union {
        sd_id128_t uuid;
 } faultd_oid_t;
 
-#define FAULTD_OID_IS_ZERO(o) (o.bson.ints[0] == 0 && \
-                                                        o.bson.ints[1] == 0 && \
-                                                        o.bson.ints[2] == 0)
-
 struct faultd_object {
        char *key;
        int type;