Moved data.h from utils to core.

This should also be considered a core component ;-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 38154a828c78b7f2c57173d9d19b51a2c4a97cab..35ac77d7f4db9634d8c811f4427ff85ac256aed8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ libsysdb_la_SOURCES = \
                core/object.c include/core/object.h \
                core/plugin.c include/core/plugin.h \
                core/store.c include/core/store.h \
-               include/utils/data.h \
+               include/core/data.h \
                core/error.c include/core/error.h \
                utils/llist.c include/utils/llist.h \
                utils/strbuf.c include/utils/strbuf.h \

diff --git a/src/include/core/data.h b/src/include/core/data.h
new file mode 100644 (file)
index 0000000..4a4dd2d
--- /dev/null
+++ b/src/include/core/data.h
@@ -0,0 +1,77 @@
+/*
+ * SysDB - src/include/core/data.h
+ * Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SDB_CORE_DATA_H
+#define SDB_CORE_DATA_H 1
+
+#include "core/time.h"
+
+#include <inttypes.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum {
+       SDB_TYPE_INTEGER = 1,
+       SDB_TYPE_DECIMAL,
+       SDB_TYPE_STRING,
+       SDB_TYPE_DATETIME,
+       SDB_TYPE_BINARY,
+};
+
+/*
+ * sdb_data_t:
+ * A datum retrieved from an arbitrary data source.
+ *
+ * The string and binary objects are managed by whoever creates the data
+ * object, thus, they must not be freed or modified. If you want to keep them,
+ * make sure to make a copy.
+ */
+typedef struct {
+       int type;
+       union {
+               int64_t     integer;  /* SDB_TYPE_INTEGER */
+               double      decimal;  /* SDB_TYPE_DECIMAL */
+               const char *string;   /* SDB_TYPE_STRING  */
+               sdb_time_t  datetime; /* SDB_TYPE_DATETIME */
+               struct {
+                       size_t length;
+                       const unsigned char *datum;
+               } binary;             /* SDB_TYPE_BINARY */
+       } data;
+} sdb_data_t;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* ! SDB_CORE_DATA_H */
+
+/* vim: set tw=78 sw=4 ts=4 noexpandtab : */
+

diff --git a/src/include/utils/data.h b/src/include/utils/data.h
deleted file mode 100644 (file)
index fc6afca..0000000
--- a/src/include/utils/data.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * SysDB - src/include/utils/data.h
- * Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SDB_UTILS_DATA_H
-#define SDB_UTILS_DATA_H 1
-
-#include "core/time.h"
-
-#include <inttypes.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-       SDB_TYPE_INTEGER = 1,
-       SDB_TYPE_DECIMAL,
-       SDB_TYPE_STRING,
-       SDB_TYPE_DATETIME,
-       SDB_TYPE_BINARY,
-};
-
-/*
- * sdb_data_t:
- * A datum retrieved from an arbitrary data source.
- *
- * The string and binary objects are managed by whoever creates the data
- * object, thus, they must not be freed or modified. If you want to keep them,
- * make sure to make a copy.
- */
-typedef struct {
-       int type;
-       union {
-               int64_t     integer;  /* SDB_TYPE_INTEGER */
-               double      decimal;  /* SDB_TYPE_DECIMAL */
-               const char *string;   /* SDB_TYPE_STRING  */
-               sdb_time_t  datetime; /* SDB_TYPE_DATETIME */
-               struct {
-                       size_t length;
-                       const unsigned char *datum;
-               } binary;             /* SDB_TYPE_BINARY */
-       } data;
-} sdb_data_t;
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* ! SDB_UTILS_DATA_H */
-
-/* vim: set tw=78 sw=4 ts=4 noexpandtab : */
-

diff --git a/src/include/utils/dbi.h b/src/include/utils/dbi.h
index c2490410de8b5a38cd66b8c89db85f0e1b9bd1df..9d5cfc05cc66dd552be7073c225e8baacf896ee1 100644 (file)
--- a/src/include/utils/dbi.h
+++ b/src/include/utils/dbi.h
@@ -29,7 +29,7 @@
 #define SDB_UTILS_DBI_H 1
 
 #include "core/object.h"
-#include "utils/data.h"
+#include "core/data.h"
 
 #include <stddef.h>
 

diff --git a/src/include/utils/unixsock.h b/src/include/utils/unixsock.h
index 3a38acaeb774b9f33453e176ec556ddb35ef71e4..b6f5c46f52794795cfa10542faaa5f850012fe00 100644 (file)
--- a/src/include/utils/unixsock.h
+++ b/src/include/utils/unixsock.h
@@ -29,7 +29,7 @@
 #define SDB_UTILS_UNIXSOCK_H 1
 
 #include "core/object.h"
-#include "utils/data.h"
+#include "core/data.h"
 
 #include <sys/socket.h>