Moved core/error to utils/error.

[sysdb.git] / src / backend / mk-livestatus.c

diff --git a/src/backend/mk-livestatus.c b/src/backend/mk-livestatus.c
index da8c99c74cc04c7fae9c0ee9e586c8f01e7d228e..bf45da6fdd35df6d3170ed4a4ebafbc1b513b49a 100644 (file)
--- a/src/backend/mk-livestatus.c
+++ b/src/backend/mk-livestatus.c
@@ -28,7 +28,7 @@
 #include "sysdb.h"
 #include "core/plugin.h"
 #include "core/store.h"
-#include "core/error.h"
+#include "utils/error.h"
 #include "utils/unixsock.h"
 
 #include "liboconfig/utils.h"
@@ -85,12 +85,10 @@ sdb_livestatus_get_svc(sdb_unixsock_client_t __attribute__((unused)) *client,
                size_t n, sdb_data_t *data,
                sdb_object_t __attribute__((unused)) *user_data)
 {
-       char *hostname = NULL;
-       char *svcname = NULL;
+       const char *hostname = NULL;
+       const char *svcname = NULL;
        sdb_time_t timestamp = 0;
 
-       sdb_service_t svc = SDB_SVC_INIT;
-
        int status;
 
        assert(n == 3);
@@ -98,21 +96,15 @@ sdb_livestatus_get_svc(sdb_unixsock_client_t __attribute__((unused)) *client,
                        && (data[1].type == SDB_TYPE_STRING)
                        && (data[2].type == SDB_TYPE_DATETIME));
 
-       hostname  = strdup(data[0].data.string);
-       svcname   = strdup(data[1].data.string);
+       hostname  = data[0].data.string;
+       svcname   = data[1].data.string;
        timestamp = data[2].data.datetime;
 
-       svc.hostname = hostname;
-       SDB_OBJ(&svc)->name = svcname;
-       svc._last_update = timestamp;
-
-       status = sdb_store_service(&svc);
+       status = sdb_store_service(hostname, svcname, timestamp);
 
        if (status < 0) {
                sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
                                "store/update service '%s / %s'.", hostname, svcname);
-               free(hostname);
-               free(svcname);
                return -1;
        }
        else if (status > 0) /* value too old */
@@ -121,8 +113,6 @@ sdb_livestatus_get_svc(sdb_unixsock_client_t __attribute__((unused)) *client,
        sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
                        "service '%s / %s' (last update timestamp = %"PRIscTIME").",
                        hostname, svcname, timestamp);
-       free(hostname);
-       free(svcname);
        return 0;
 } /* sdb_livestatus_get_svc */