Change naming convention of internal event function

Change the naming convention by adding "_internal" suffix to functions
called by subclasses.

diff --git a/src/core/event.c b/src/core/event.c
index 186b526829faa742b2148373f5f2163681da50f6..481827eb304ae7cb60b55ad9f218920f4b80297a 100644 (file)
--- 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 3c000beae99a35f7aeb6d5a6f48821fdc623d70e..fe1f8ed6e0d0eb1d65844039c2da2ef2ff68560b 100644 (file)
--- 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 40cc664bc172961ef44d88a1f174b6ffb93b9f53..51d8e390172b0e6774ffb2361996a87de9eed800 100644 (file)
--- 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 0b3c86cb811e5f41606dabcb44d08e4c8f95f840..1ab1e7e87df3d52c322f03d5fe98b665a41c93e7 100644 (file)
--- 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 189d7aaa6ac15408da2f307be12e3c842fa37a2a..bb246fd6e27d88b665854460ce6a71c37b8cb0c2 100644 (file)
--- 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);
 }