From fa5c130fbd0c75f3c47f1b28feb8d76a4791a93e Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 1 Apr 2013 19:56:55 +0200 Subject: [PATCH] Moved error / time from utils to core. This is more appropriate. --- src/Makefile.am | 4 ++-- src/backend/collectd/unixsock.c | 2 +- src/backend/mk-livestatus.c | 2 +- src/backend/puppet/store-configs.c | 2 +- src/{utils => core}/error.c | 4 ++-- src/core/plugin.c | 4 ++-- src/core/store.c | 2 +- src/{utils => core}/time.c | 4 ++-- src/daemon/config.c | 4 ++-- src/daemon/sysdbd.c | 2 +- src/include/{utils => core}/error.h | 8 ++++---- src/include/core/plugin.h | 2 +- src/include/core/store.h | 2 +- src/include/{utils => core}/time.h | 8 ++++---- src/include/utils/data.h | 2 +- src/utils/dbi.c | 2 +- src/utils/unixsock.c | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) rename src/{utils => core}/error.c (99%) rename src/{utils => core}/time.c (97%) rename src/include/{utils => core}/error.h (97%) rename src/include/{utils => core}/time.h (95%) diff --git a/src/Makefile.am b/src/Makefile.am index 9876de6..38154a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,10 +23,10 @@ libsysdb_la_SOURCES = \ core/plugin.c include/core/plugin.h \ core/store.c include/core/store.h \ include/utils/data.h \ - utils/error.c include/utils/error.h \ + core/error.c include/core/error.h \ utils/llist.c include/utils/llist.h \ utils/strbuf.c include/utils/strbuf.h \ - utils/time.c include/utils/time.h \ + core/time.c include/core/time.h \ utils/unixsock.c include/utils/unixsock.h libsysdb_la_CFLAGS = $(AM_CFLAGS) libsysdb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) diff --git a/src/backend/collectd/unixsock.c b/src/backend/collectd/unixsock.c index 78c238d..9457739 100644 --- a/src/backend/collectd/unixsock.c +++ b/src/backend/collectd/unixsock.c @@ -28,7 +28,7 @@ #include "sysdb.h" #include "core/plugin.h" #include "core/store.h" -#include "utils/error.h" +#include "core/error.h" #include "utils/unixsock.h" #include "liboconfig/utils.h" diff --git a/src/backend/mk-livestatus.c b/src/backend/mk-livestatus.c index 200edc2..e151b52 100644 --- 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 "utils/error.h" +#include "core/error.h" #include "utils/unixsock.h" #include "liboconfig/utils.h" diff --git a/src/backend/puppet/store-configs.c b/src/backend/puppet/store-configs.c index 84855c6..8b3804b 100644 --- a/src/backend/puppet/store-configs.c +++ b/src/backend/puppet/store-configs.c @@ -28,7 +28,7 @@ #include "sysdb.h" #include "core/plugin.h" #include "core/store.h" -#include "utils/error.h" +#include "core/error.h" #include "utils/dbi.h" #include "liboconfig/utils.h" diff --git a/src/utils/error.c b/src/core/error.c similarity index 99% rename from src/utils/error.c rename to src/core/error.c index c62b20d..cdd5d04 100644 --- a/src/utils/error.c +++ b/src/core/error.c @@ -1,5 +1,5 @@ /* - * SysDB - src/utils/error.c + * SysDB - src/core/error.c * Copyright (C) 2013 Sebastian 'tokkee' Harl * All rights reserved. * @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/error.h" +#include "core/error.h" #include "utils/strbuf.h" #include diff --git a/src/core/plugin.c b/src/core/plugin.c index 5df7059..5fdaca0 100644 --- a/src/core/plugin.c +++ b/src/core/plugin.c @@ -27,9 +27,9 @@ #include "sysdb.h" #include "core/plugin.h" -#include "utils/error.h" +#include "core/error.h" +#include "core/time.h" #include "utils/llist.h" -#include "utils/time.h" #include diff --git a/src/core/store.c b/src/core/store.c index 4e841ba..714a0b3 100644 --- a/src/core/store.c +++ b/src/core/store.c @@ -27,7 +27,7 @@ #include "sysdb.h" #include "core/store.h" -#include "utils/error.h" +#include "core/error.h" #include "utils/llist.h" #include diff --git a/src/utils/time.c b/src/core/time.c similarity index 97% rename from src/utils/time.c rename to src/core/time.c index 4823205..3baf224 100644 --- a/src/utils/time.c +++ b/src/core/time.c @@ -1,5 +1,5 @@ /* - * SysDB - src/utils/time.c + * SysDB - src/core/time.c * Copyright (C) 2012 Sebastian 'tokkee' Harl * All rights reserved. * @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/time.h" +#include "core/time.h" #include diff --git a/src/daemon/config.c b/src/daemon/config.c index ac95b6c..03bc2b8 100644 --- a/src/daemon/config.c +++ b/src/daemon/config.c @@ -27,8 +27,8 @@ #include "sysdb.h" #include "core/plugin.h" -#include "utils/error.h" -#include "utils/time.h" +#include "core/error.h" +#include "core/time.h" #include "daemon/config.h" diff --git a/src/daemon/sysdbd.c b/src/daemon/sysdbd.c index 99c1296..f199261 100644 --- a/src/daemon/sysdbd.c +++ b/src/daemon/sysdbd.c @@ -32,7 +32,7 @@ #include "sysdb.h" #include "core/plugin.h" #include "core/store.h" -#include "utils/error.h" +#include "core/error.h" #include "daemon/config.h" diff --git a/src/include/utils/error.h b/src/include/core/error.h similarity index 97% rename from src/include/utils/error.h rename to src/include/core/error.h index 33731e1..d2ee9f7 100644 --- a/src/include/utils/error.h +++ b/src/include/core/error.h @@ -1,5 +1,5 @@ /* - * SysDB - src/include/utils/error.h + * SysDB - src/include/core/error.h * Copyright (C) 2013 Sebastian 'tokkee' Harl * All rights reserved. * @@ -36,8 +36,8 @@ * added later in a modular fashion. */ -#ifndef SDB_UTILS_ERROR_H -#define SDB_UTILS_ERROR_H 1 +#ifndef SDB_CORE_ERROR_H +#define SDB_CORE_ERROR_H 1 #include @@ -135,7 +135,7 @@ sdb_strerror(int errnum, char *strerrbuf, size_t buflen); } /* extern "C" */ #endif -#endif /* ! SDB_UTILS_ERROR_H */ +#endif /* ! SDB_CORE_ERROR_H */ /* vim: set tw=78 sw=4 ts=4 noexpandtab : */ diff --git a/src/include/core/plugin.h b/src/include/core/plugin.h index 1ac243a..ac8656a 100644 --- a/src/include/core/plugin.h +++ b/src/include/core/plugin.h @@ -30,7 +30,7 @@ #include "sysdb.h" #include "core/object.h" -#include "utils/time.h" +#include "core/time.h" #include "liboconfig/oconfig.h" diff --git a/src/include/core/store.h b/src/include/core/store.h index 46cd536..6bda967 100644 --- a/src/include/core/store.h +++ b/src/include/core/store.h @@ -30,7 +30,7 @@ #include "sysdb.h" #include "core/object.h" -#include "utils/time.h" +#include "core/time.h" #include "utils/llist.h" #include diff --git a/src/include/utils/time.h b/src/include/core/time.h similarity index 95% rename from src/include/utils/time.h rename to src/include/core/time.h index cd781e3..30e920b 100644 --- a/src/include/utils/time.h +++ b/src/include/core/time.h @@ -1,5 +1,5 @@ /* - * SysDB - src/include/utils/time.h + * SysDB - src/include/core/time.h * Copyright (C) 2012 Sebastian 'tokkee' Harl * All rights reserved. * @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SDB_UTILS_TIME_H -#define SDB_UTILS_TIME_H 1 +#ifndef SDB_CORE_TIME_H +#define SDB_CORE_TIME_H 1 #include #include @@ -67,7 +67,7 @@ sdb_strftime(char *s, size_t len, const char *format, sdb_time_t); } /* extern "C" */ #endif -#endif /* ! SDB_UTILS_TIME_H */ +#endif /* ! SDB_CORE_TIME_H */ /* vim: set tw=78 sw=4 ts=4 noexpandtab : */ diff --git a/src/include/utils/data.h b/src/include/utils/data.h index 0f38a11..fc6afca 100644 --- a/src/include/utils/data.h +++ b/src/include/utils/data.h @@ -28,7 +28,7 @@ #ifndef SDB_UTILS_DATA_H #define SDB_UTILS_DATA_H 1 -#include "utils/time.h" +#include "core/time.h" #include #include diff --git a/src/utils/dbi.c b/src/utils/dbi.c index f89e463..db93857 100644 --- a/src/utils/dbi.c +++ b/src/utils/dbi.c @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/error.h" +#include "core/error.h" #include "utils/dbi.h" #include diff --git a/src/utils/unixsock.c b/src/utils/unixsock.c index 8c0abb2..138205d 100644 --- a/src/utils/unixsock.c +++ b/src/utils/unixsock.c @@ -26,7 +26,7 @@ */ #include "utils/unixsock.h" -#include "utils/error.h" +#include "core/error.h" #include #include -- 2.30.2