From: Paweł Szewczyk
Date: Mon, 21 Aug 2017 12:49:11 +0000 (+0200)
Subject: Remove reason's OID checking during serialization
X-Git-Tag: submit/tizen/20170821.133151^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_4.0;p=platform%2Fcore%2Fsystem%2Ffaultd.git
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
---
diff --git a/src/event_types/action_executed_event.c b/src/event_types/action_executed_event.c
index 7a95812..4af8362 100644
--- 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 d2a3d17..fafce4f 100644
--- 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 15b1ad2..31a0907 100644
--- 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;