Fix compilation issues

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

diff --git a/src/core/module.c b/src/core/module.c
index c28be9ba4f7e1aeb25e0334733cd90ee6091ffb7..04fd49fde59c9b1be2c41d49db9152a4f5192e9b 100644 (file)
--- a/src/core/module.c
+++ b/src/core/module.c
@@ -16,14 +16,17 @@
  * limitations under the License.
  */
 
+#include <errno.h>
+
 #include "module.h"
 #include "log.h"
+#include "common.h"
 
 static struct list_head modules[FAULTD_MODULE_TYPE_MAX];
 
-static void init_heads()
+static void init_heads(void)
 {
-        int i;
+        unsigned i;
 
         for (i = 0; i < ARRAY_SIZE(modules); ++i)
                 INIT_LIST_HEAD(modules + i);
@@ -39,7 +42,9 @@ int faultd_module_register(struct faultd_module *module)
         if (!modules[0].next)
                 init_heads();
 
-        list_add_tail(&module->node, modules[module->type]);
+        list_add_tail(&module->node, modules + module->type);
+
+        return 0;
 }
 
 void faultd_module_unregister(struct faultd_module *module)
@@ -56,7 +61,7 @@ int faultd_modules_init(sd_event *event_loop)
         if (!modules[0].next)
                 init_heads();
 
-        for (i = 0; i < ARRAY_SIZE(modules); ++i) {
+        for (i = 0; i < (int)(ARRAY_SIZE(modules)); ++i) {
                 log_debug("Initializing modules category %d", i);
                 list_for_each_entry(module, modules + i, node) {
                         log_debug("Initializing %s module", module->name);
@@ -92,6 +97,7 @@ err_cleanup:
 
 void faultd_modules_cleanup()
 {
+        struct faultd_module *module;
         int i;
 
         for (i = FAULTD_MODULE_TYPE_MAX - 1; i >= 0; --i) {
@@ -99,9 +105,7 @@ void faultd_modules_cleanup()
                 list_for_each_entry(module, modules + i, node) {
                         log_debug("Cleaning up %s module", module->name);
                         
-                        ret = module->cleanup(module);
-                        if (ret)
-                                goto err_cleanup;
-                
+                        module->cleanup(module);
+                }              
         }
 }

diff --git a/src/core/module.h b/src/core/module.h
index d12254c2cadd290ad908f16d9d6b267a7d9e83ac..b058b9331f6a22ff8e973b789d83e5b180101d91 100644 (file)
--- a/src/core/module.h
+++ b/src/core/module.h
@@ -20,6 +20,7 @@
 #define FAULTD_MODULE_H
 
 #include <time.h>
+#include <systemd/sd-event.h>
 
 #include "list.h"
 
@@ -47,8 +48,8 @@ struct faultd_module {
 int faultd_module_register(struct faultd_module *module);
 void faultd_module_unregister(struct faultd_module *module);
 
-int faultd_modules_init();
-void faultd_modules_cleanup();
+int faultd_modules_init(sd_event *event_loop);
+void faultd_modules_cleanup(void);
 
 #ifndef __CONSTRUCTOR__
 #define __CONSTRUCTOR__ __attribute__((constructor))

diff --git a/src/core/notify_queue.c b/src/core/notify_queue.c
index 1bd3a855ecd25f562b2daf3ec11208e630fa29a5..125d7664dcaab3886131563828b1e77969d14184 100644 (file)
--- a/src/core/notify_queue.c
+++ b/src/core/notify_queue.c
@@ -18,6 +18,7 @@
 #include "notify_queue.h"
 
 #include <sys/eventfd.h>
+#include <errno.h>
 
 int init_notify_queue_head(struct nqueue_head *head)
 {

diff --git a/src/core/notify_queue.h b/src/core/notify_queue.h
index 828c5e19783a842078342741f7c513105cce350d..43274fd41c63cc66d6f11358b398c06128ca8443 100644 (file)
--- a/src/core/notify_queue.h
+++ b/src/core/notify_queue.h
@@ -20,7 +20,9 @@
 #define FAULTD_NOTIFY_QUEUE_H
 
 #include <unistd.h>
+#include <stdint.h>
 
+#include "queue.h"
 
 /*
  * Simple queue with fd notification for use in main loop
@@ -42,9 +44,9 @@ static inline int nqueue_get_notify_fd(struct nqueue_head *head)
         return head->fd;
 }
 
-#define NQUEUE_NODE_INIT QUEUE_INIT
+#define NQUEUE_NODE_INIT(node) QUEUE_INIT(node)
 
-#define INIT_NQUEUE_NODE INIT_QUEUE_HEAD 
+#define INIT_NQUEUE_NODE(node) INIT_QUEUE_HEAD(node)
 
 static inline int nqueue_append(struct nqueue_head *head,
                                 struct nqueue_node *new)

diff --git a/src/core/queue.h b/src/core/queue.h
index a83d270b15d5c34bcc0d4423fa2bed0907625291..816a2ff271183b98773d1420cfd6697cecd5d68e 100644 (file)
--- a/src/core/queue.h
+++ b/src/core/queue.h
@@ -27,9 +27,9 @@
 
 #define queue_head list_head
 
-#define QUEUE_INIT LIST_INIT
+#define QUEUE_INIT(name) LIST_HEAD_INIT(name)
 
-#define INIT_QUEUE_HEAD INIT_LIST_HEAD;
+#define INIT_QUEUE_HEAD(head) INIT_LIST_HEAD(head);
 
 #define queue_append(head, new) list_add_tail(new, head);
 

diff --git a/src/faultd.c b/src/faultd.c
index 6f30a68d2598c5c459545c473e9339c31f71b11f..ae7b1050339b737b5d1c52cc004506b8d8de5637 100644 (file)
--- a/src/faultd.c
+++ b/src/faultd.c
@@ -25,9 +25,7 @@
 #include <signal.h>
 #include <syslog.h>
 
-#include "audit.h"
 #include "log.h"
-#include "systemd.h"
 
 static int terminate = 0;
 

diff --git a/src/listeners/systemd.c b/src/listeners/systemd.c
index b189d1cb2fb8ede8b0dc5a40292c20dc2e8d119c..040b663a553613135965fc422528ef409123ee2c 100644 (file)
--- a/src/listeners/systemd.c
+++ b/src/listeners/systemd.c
@@ -21,7 +21,6 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "systemd.h"
 #include "log.h"
 #include "module.h"