compilation fixi

Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>

diff --git a/src/core/module.h b/src/core/module.h
index b058b9331f6a22ff8e973b789d83e5b180101d91..ee37deabdcc3c631ab22e393e2843458dce97fc0 100644 (file)
--- a/src/core/module.h
+++ b/src/core/module.h
@@ -23,6 +23,7 @@
 #include <systemd/sd-event.h>
 
 #include "list.h"
+#include "common.h"
 
 /* Order in this enum is also order of initialization */
 enum faultd_module_type {

diff --git a/src/faultd.c b/src/faultd.c
index ae7b1050339b737b5d1c52cc004506b8d8de5637..be828ec2ea282c1709a1d1b888c9663594e808db 100644 (file)
--- a/src/faultd.c
+++ b/src/faultd.c
@@ -26,6 +26,7 @@
 #include <syslog.h>
 
 #include "log.h"
+#include "module.h"
 
 static int terminate = 0;
 
@@ -107,7 +108,7 @@ int main(int ac, char* av[])
         rc = sd_event_add_signal(loop, NULL, SIGINT, sigint_handler, loop);
 
 
-        rc = faultd_modules_init();
+        rc = faultd_modules_init(loop);
         if (rc < 0) {
                 log_error("Failed to initialize modules %d.", rc);
                 return -1;

diff --git a/src/listeners/audit.c b/src/listeners/audit.c
index 93db0ea04f57834b4524302251f757bc98f59e41..ad90e6022ca63952b61552b01f0c2f826886117e 100644 (file)
--- a/src/listeners/audit.c
+++ b/src/listeners/audit.c
@@ -130,7 +130,7 @@ static int audit_handler(sd_event_source *s, int fd, uint32_t revents, void *use
 
 static int audit_listener_init(struct faultd_module *module, sd_event *event)
 {
-        struct audit_listener alistener = to_audit_listener(module);
+        struct audit_listener *alistener = to_audit_listener(module);
        int fd;
         sd_event_source *event_source;
        int ret;
@@ -184,7 +184,7 @@ close_audit:
 
 static void audit_listener_cleanup(struct faultd_module *module)
 {
-        struct audit_listener alistener = to_audit_listener(module);
+        struct audit_listener *alistener = to_audit_listener(module);
         int fd = alistener->audit_fd;
         sd_event_source *event_source = alistener->event_source;
        int ret;
@@ -205,7 +205,6 @@ static void audit_listener_cleanup(struct faultd_module *module)
                log_error("Could not set pid (%d)", ret);
 
        audit_close(fd);
-       return 0;
 }
 
 struct audit_listener audit_listener = {
@@ -215,9 +214,9 @@ struct audit_listener audit_listener = {
 
                 .init = audit_listener_init,
                 .cleanup = audit_listener_cleanup,
-                .node = LIST_HEAD_INIT,
+                .node = LIST_HEAD_INIT(audit_listener.module.node),
         },
         .audit_fd = -1,
 };
 
-FAULTD_MODULE_REGISTER(&audit_listener)
+FAULTD_MODULE_REGISTER(&audit_listener.module)

diff --git a/src/listeners/systemd.c b/src/listeners/systemd.c
index 040b663a553613135965fc422528ef409123ee2c..3ec551fd4568f1c7ff0f4c030cc1897a5b9855bd 100644 (file)
--- a/src/listeners/systemd.c
+++ b/src/listeners/systemd.c
@@ -175,7 +175,7 @@ static int systemd_listener_init(struct faultd_module *module, sd_event* loop)
         return 0;
 }
 
-static void systemd_listener_cleanup()
+static void systemd_listener_cleanup(struct faultd_module *module)
 {
         sd_bus_error error = SD_BUS_ERROR_NULL;
         sd_bus *bus = NULL;
@@ -213,4 +213,4 @@ struct systemd_listener systemd_listener = {
         },
 };
 
-FAULTD_MODULE_REGISTER(&systemd_listener)
+FAULTD_MODULE_REGISTER(&systemd_listener.module)