summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2017-05-09 13:17:47 +0200
committerKrzysztof Opasiak <k.opasiak@samsung.com>2017-05-09 13:55:31 +0200
commit12a1270719845537c5fef2de952a87c333e65844 (patch)
treea657b0446b5a394f5a4727db03fa2b6933ccfcdb
parentfc4aa40c42d8ae74839caf677a560aca7ba00d19 (diff)
downloadfaultd-12a1270719845537c5fef2de952a87c333e65844.tar.gz
faultd-12a1270719845537c5fef2de952a87c333e65844.tar.bz2
faultd-12a1270719845537c5fef2de952a87c333e65844.zip
Change naming convention of internal event function
Change the naming convention by adding "_internal" suffix to functions called by subclasses.
-rw-r--r--src/core/event.c4
-rw-r--r--src/core/event.h7
-rw-r--r--src/event_types/decision_made_event.c6
-rw-r--r--src/event_types/resource_violation_event.c4
-rw-r--r--src/event_types/service_failed_event.c4
5 files changed, 13 insertions, 12 deletions
diff --git a/src/core/event.c b/src/core/event.c
index c82be74..d82e87d 100644
--- a/src/core/event.c
+++ b/src/core/event.c
@@ -102,8 +102,8 @@ static void release_faultd_event(struct uref *uref)
ev->ops.release(ev);
}
-int faultd_event_init(struct faultd_event_type *ev_type,
- struct faultd_event *ev)
+int faultd_event_init_internal(struct faultd_event_type *ev_type,
+ struct faultd_event *ev)
{
int ret;
diff --git a/src/core/event.h b/src/core/event.h
index 949ba3b..04a8452 100644
--- a/src/core/event.h
+++ b/src/core/event.h
@@ -112,9 +112,10 @@ static inline char *faultd_event_to_string(struct faultd_event *ev)
return ev->ops.to_string(ev);
}
-int faultd_event_init(struct faultd_event_type *ev_type,
- struct faultd_event *ev);
+int faultd_event_init_internal(struct faultd_event_type *ev_type,
+ struct faultd_event *ev);
+
+static inline void faultd_event_cleanup_internal(struct faultd_event *ev) {}
-static inline void faultd_event_cleanup(struct faultd_event *ev) {}
#endif /* FAULTD_EVENT_H */
diff --git a/src/event_types/decision_made_event.c b/src/event_types/decision_made_event.c
index 0c52036..4857bbb 100644
--- a/src/event_types/decision_made_event.c
+++ b/src/event_types/decision_made_event.c
@@ -34,7 +34,7 @@ static int allocate_dm_event(struct faultd_event_type *type,
if (!dm_ev)
return -ENOMEM;
- ret = faultd_event_init(type, &dm_ev->event);
+ ret = faultd_event_init_internal(type, &dm_ev->event);
if (ret)
goto free_dm_ev;
@@ -58,7 +58,7 @@ cleanup_strs:
free(dm_ev->who_made);
free(dm_ev->action);
- faultd_event_cleanup(&dm_ev->event);
+ faultd_event_cleanup_internal(&dm_ev->event);
free_dm_ev:
free(dm_ev);
@@ -75,7 +75,7 @@ static void dm_event_release(struct faultd_event *ev)
if (dm_ev->action_data_release)
dm_ev->action_data_release(dm_ev->action_data);
faultd_event_unref(dm_ev->reason);
- faultd_event_cleanup(&dm_ev->event);
+ faultd_event_cleanup_internal(&dm_ev->event);
free(dm_ev);
}
diff --git a/src/event_types/resource_violation_event.c b/src/event_types/resource_violation_event.c
index 70a0d48..c59c16e 100644
--- a/src/event_types/resource_violation_event.c
+++ b/src/event_types/resource_violation_event.c
@@ -34,7 +34,7 @@ static int allocate_rv_event(struct faultd_event_type *type,
if (!rv_ev)
return -ENOMEM;
- ret = faultd_event_init(type, &rv_ev->event);
+ ret = faultd_event_init_internal(type, &rv_ev->event);
if (ret)
goto free_rv_ev;
@@ -56,7 +56,7 @@ static void rv_event_release(struct faultd_event *ev)
to_resource_violation_event(ev);
systemd_service_cleanup(&rv_ev->service);
- faultd_event_cleanup(&rv_ev->event);
+ faultd_event_cleanup_internal(&rv_ev->event);
free(rv_ev);
}
diff --git a/src/event_types/service_failed_event.c b/src/event_types/service_failed_event.c
index f8dd74d..5e445aa 100644
--- a/src/event_types/service_failed_event.c
+++ b/src/event_types/service_failed_event.c
@@ -34,7 +34,7 @@ static int allocate_sf_event(struct faultd_event_type *type,
if (!sf_ev)
return -ENOMEM;
- ret = faultd_event_init(type, &sf_ev->event);
+ ret = faultd_event_init_internal(type, &sf_ev->event);
if (ret)
goto free_rv_ev;
@@ -57,7 +57,7 @@ static void sf_event_release(struct faultd_event *ev)
to_service_failed_event(ev);
systemd_service_cleanup(&sf_ev->service);
- faultd_event_cleanup(&sf_ev->event);
+ faultd_event_cleanup_internal(&sf_ev->event);
free(sf_ev);
}