Testing complete. High level API works.

2 files changed, 15 insertions, 15 deletions

diff --git a/sinks/file/elapi_sink_file.c b/sinks/file/elapi_sink_file.c
index 660aba3..2d50b4f 100644
--- a/sinks/file/elapi_sink_file.c
+++ b/sinks/file/elapi_sink_file.c
@@ -112,9 +112,9 @@ static int init_config(struct data_descriptor *dblock)
     dblock->config = (void *)(conf_data);
 
     if((conf_data->file_name != NULL) && (conf_data->keep_open != 0)) {
-        file_conf->file = fopen(conf_data->file_name,"w");
+        conf_data->file = fopen(conf_data->file_name,"w");
     }
-    else conf_data->file_name = stderr;
+    else conf_data->file = stderr;
 
     DEBUG_STRING("init_config","Entry");
     return EOK;
@@ -132,8 +132,8 @@ static int file_sink_init(struct data_descriptor *dblock)
     /* Prepare the block where the format function will store its data */
     errno = 0;
     dblock->internal_data = NULL;
-    event_storage = (struct serail_data *)(malloc(sizeof(struct serial_data)));
-    if(event_storage == (struct serail_data *)(NULL)) return errno;
+    event_storage = (struct serial_data *)(malloc(sizeof(struct serial_data)));
+    if(event_storage == (struct serial_data *)(NULL)) return errno;
 
     event_storage->buffer = NULL;
     event_storage->size = 0;
@@ -199,7 +199,7 @@ static void file_sink_cleanup(struct data_descriptor *dblock)
 
     DEBUG_STRING("file_sink_cleanup","Entry");
 
-    event_storage = (struct file_event *)(dblock->internal_data);
+    event_storage = (struct serial_data *)(dblock->internal_data);
 
     if(event_storage->buffer != NULL) {
         free(event_storage->buffer);
@@ -215,7 +215,7 @@ static void file_sink_cleanup(struct data_descriptor *dblock)
 /* Close facility */ 
 static void file_sink_close(struct data_descriptor *dblock)
 {
-    struct file_conf *config;
+    struct file_conf *conf_data;
 
     DEBUG_STRING("file_sink_close","Entry");
 
@@ -226,13 +226,13 @@ static void file_sink_close(struct data_descriptor *dblock)
     }
 
     if(dblock->config != NULL) {
-        config = (struct file_conf *)(dblock->config);
+        conf_data = (struct file_conf *)(dblock->config);
 
         if((conf_data->file_name != NULL) && (conf_data->keep_open != 0)) {
-            close(file_conf->file);
+            close(conf_data->file);
         }
 
-        if(config->file_name != NULL) free(config->file_name);
+        if(conf_data->file_name != NULL) free(conf_data->file_name);
         free(dblock->config);
         dblock->config=NULL;
     }
@@ -245,25 +245,25 @@ static void file_sink_close(struct data_descriptor *dblock)
 static int file_sink_submit(struct data_descriptor *dblock)
 {
     struct serial_data *event_storage;
-    struct file_conf *config;
+    struct file_conf *conf_data;
 
     DEBUG_STRING("file_sink_submit","Entry");
     DEBUG_NUMBER("DBLOCK in submit",dblock);
     DEBUG_NUMBER("internal data in submit",dblock->internal_data);
 
     event_storage = (struct file_event *)(dblock->internal_data);
-    config = (struct file_conf *)(dblock->config);
+    conf_data = (struct file_conf *)(dblock->config);
    
     DEBUG_STRING("OUTPUT:",event_storage->buffer);
 
     if((conf_data->file_name != NULL) && (conf_data->keep_open == 0)) {
-        file_conf->file = fopen(conf_data->file_name,"w");
+        conf_data->file = fopen(conf_data->file_name,"w");
     }
 
-    fprintf(file_conf->file, "%s\n", event_storage->buffer);
+    fprintf(conf_data->file, "%s\n", event_storage->buffer);
 
     if((conf_data->file_name != NULL) && (conf_data->keep_open == 0)) {
-        close(file_conf->file);
+        close(conf_data->file);
     }
 
     file_sink_cleanup(dblock);
diff --git a/sinks/syslog/elapi_sink_syslog.c b/sinks/syslog/elapi_sink_syslog.c
index eb1585e..ab3d3d2 100644
--- a/sinks/syslog/elapi_sink_syslog.c
+++ b/sinks/syslog/elapi_sink_syslog.c
@@ -212,7 +212,7 @@ static int syslog_sink_format(struct data_descriptor *dblock,
 {
     struct syslog_event *event_storage;
     struct syslog_conf *config;
-    struct collection_item *item;
+    struct collection_item *item = (struct collection_item *)(NULL);
     int error = EOK;
 
     DEBUG_STRING("syslog_sink_format","Entry");