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 c82be7467c1307217a838adeff8d38d3e9776ca5..d82e87d83fe0b13004370a21c13323218e4b3733 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 949ba3b21debbd00d004a6f103498ef1c5292b2b..04a8452f76e5e2244f4a368121c5f301642eac26 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 0c52036c1dff9e289805f53cfc3e6eb8773fd210..4857bbbb34e043ec3982aa10059f350afa48624e 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 70a0d4869de8f4fc0406d2b5a3c671a3e7f0d19a..c59c16e018f67cfaae426448f49e6ea0dcbd7a8b 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 f8dd74de816bd94a9333444b94ae83b5852454dc..5e445aab90b7aba4a6142d0704a8191cffe0e7e1 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);
 }