From: Vladimír Čunát Date: Tue, 30 Jan 2018 14:07:20 +0000 (+0100) Subject: move files: all cache stuff is in lib/cache/ now X-Git-Tag: v2.0.0~6^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c4599cd6d230c951a53d032dbbede03ba374932;p=thirdparty%2Fknot-resolver.git move files: all cache stuff is in lib/cache/ now Almost. A trivial lib/layer/cache.c remains. I put all lib/generic/*.h into libkres_HEADERS, to be sure. They rarely change anyway. --- diff --git a/daemon/bindings.c b/daemon/bindings.c index a2e8c9ec2..bac13c2f4 100644 --- a/daemon/bindings.c +++ b/daemon/bindings.c @@ -20,8 +20,8 @@ #include #include -#include "lib/cache.h" -#include "lib/cdb.h" +#include "lib/cache/api.h" +#include "lib/cache/cdb_api.h" #include "lib/utils.h" #include "daemon/bindings.h" #include "daemon/worker.h" diff --git a/daemon/engine.c b/daemon/engine.c index 2705c6c4e..c86bc68c6 100644 --- a/daemon/engine.c +++ b/daemon/engine.c @@ -28,9 +28,9 @@ #include "daemon/bindings.h" #include "daemon/ffimodule.h" #include "lib/nsrep.h" -#include "lib/cache.h" +#include "lib/cache/api.h" #include "lib/defines.h" -#include "lib/cdb_lmdb.h" +#include "lib/cache/cdb_lmdb.h" #include "lib/dnssec/ta.h" /** @internal Compatibility wrapper for Lua < 5.2 */ diff --git a/lib/cache.c b/lib/cache/api.c similarity index 99% rename from lib/cache.c rename to lib/cache/api.c index 5ea2bf77e..dd61ff981 100644 --- a/lib/cache.c +++ b/lib/cache/api.c @@ -29,8 +29,8 @@ #include "contrib/ucw/lib.h" #include "contrib/cleanup.h" -#include "lib/cache.h" -#include "lib/cdb_lmdb.h" +#include "lib/cache/api.h" +#include "lib/cache/cdb_lmdb.h" #include "lib/defines.h" #include "lib/utils.h" diff --git a/lib/cache.h b/lib/cache/api.h similarity index 99% rename from lib/cache.h rename to lib/cache/api.h index 09a382201..40f24730c 100644 --- a/lib/cache.h +++ b/lib/cache/api.h @@ -19,7 +19,7 @@ #include #include #include -#include "lib/cdb.h" +#include "lib/cache/cdb_api.h" #include "lib/defines.h" #include "contrib/ucw/config.h" /*uint*/ diff --git a/lib/cdb.h b/lib/cache/cdb_api.h similarity index 100% rename from lib/cdb.h rename to lib/cache/cdb_api.h diff --git a/lib/cdb_lmdb.c b/lib/cache/cdb_lmdb.c similarity index 99% rename from lib/cdb_lmdb.c rename to lib/cache/cdb_lmdb.c index 8af549460..079b1f4bf 100644 --- a/lib/cdb_lmdb.c +++ b/lib/cache/cdb_lmdb.c @@ -25,8 +25,8 @@ #include #include "contrib/cleanup.h" -#include "lib/cdb_lmdb.h" -#include "lib/cache.h" +#include "lib/cache/cdb_lmdb.h" +#include "lib/cache/api.h" #include "lib/utils.h" diff --git a/lib/cdb_lmdb.h b/lib/cache/cdb_lmdb.h similarity index 96% rename from lib/cdb_lmdb.h rename to lib/cache/cdb_lmdb.h index 7393eb065..bc2c7d62a 100644 --- a/lib/cdb_lmdb.h +++ b/lib/cache/cdb_lmdb.h @@ -16,7 +16,7 @@ #pragma once -#include "lib/cdb.h" +#include "lib/cache/cdb_api.h" #include "lib/defines.h" KR_EXPORT KR_CONST diff --git a/lib/cache/impl.h b/lib/cache/impl.h index a3abfb2c8..0ab531cfd 100644 --- a/lib/cache/impl.h +++ b/lib/cache/impl.h @@ -28,7 +28,7 @@ #include #include "contrib/cleanup.h" -#include "lib/cdb.h" +#include "lib/cache/cdb_api.h" #include "lib/resolve.h" /** Cache entry header diff --git a/lib/layer/cache.c b/lib/layer/cache.c index 288ff861b..c7bbc1ab6 100644 --- a/lib/layer/cache.c +++ b/lib/layer/cache.c @@ -15,7 +15,7 @@ */ #include "lib/module.h" -#include "lib/cache.h" +#include "lib/cache/api.h" /** Module implementation. */ const kr_layer_api_t *cache_layer(struct kr_module *module) diff --git a/lib/lib.mk b/lib/lib.mk index 4889a6ec5..c3256831d 100644 --- a/lib/lib.mk +++ b/lib/lib.mk @@ -1,48 +1,52 @@ libkres_SOURCES := \ - lib/generic/lru.c \ - lib/generic/map.c \ - lib/layer/iterate.c \ - lib/layer/validate.c \ - lib/layer/cache.c \ - lib/dnssec/nsec.c \ - lib/dnssec/nsec3.c \ - lib/dnssec/signature.c \ - lib/dnssec/ta.c \ - lib/dnssec.c \ - lib/utils.c \ - lib/nsrep.c \ - lib/module.c \ - lib/resolve.c \ - lib/zonecut.c \ - lib/rplan.c \ - lib/cache.c \ + lib/cache/api.c \ + lib/cache/cdb_lmdb.c \ lib/cache/entry_list.c \ - lib/cache/entry_pkt.c \ - lib/cache/entry_rr.c \ - lib/cache/knot_pkt.c \ - lib/cache/nsec1.c \ - lib/cdb_lmdb.c + lib/cache/entry_pkt.c \ + lib/cache/entry_rr.c \ + lib/cache/knot_pkt.c \ + lib/cache/nsec1.c \ + lib/dnssec.c \ + lib/dnssec/nsec.c \ + lib/dnssec/nsec3.c \ + lib/dnssec/signature.c \ + lib/dnssec/ta.c \ + lib/generic/lru.c \ + lib/generic/map.c \ + lib/layer/cache.c \ + lib/layer/iterate.c \ + lib/layer/validate.c \ + lib/module.c \ + lib/nsrep.c \ + lib/resolve.c \ + lib/rplan.c \ + lib/utils.c \ + lib/zonecut.c libkres_HEADERS := \ - lib/generic/array.h \ - lib/generic/lru.h \ - lib/generic/map.h \ - lib/generic/set.h \ - lib/layer.h \ - lib/dnssec/nsec.h \ - lib/dnssec/nsec3.h \ + lib/cache/api.h \ + lib/cache/cdb_api.h \ + lib/cache/cdb_lmdb.h \ + lib/cache/impl.h \ + lib/defines.h \ + lib/dnssec.h \ + lib/dnssec/nsec.h \ + lib/dnssec/nsec3.h \ lib/dnssec/signature.h \ - lib/dnssec/ta.h \ - lib/dnssec.h \ - lib/utils.h \ - lib/nsrep.h \ - lib/module.h \ - lib/resolve.h \ - lib/zonecut.h \ - lib/rplan.h \ - lib/cache.h \ - lib/cdb.h \ - lib/cdb_lmdb.h + lib/dnssec/ta.h \ + lib/generic/array.h \ + lib/generic/lru.h \ + lib/generic/map.h \ + lib/generic/pack.h \ + lib/generic/set.h \ + lib/layer.h \ + lib/layer/iterate.h \ + lib/module.h \ + lib/nsrep.h \ + lib/resolve.h \ + lib/rplan.h \ + lib/utils.h \ + lib/zonecut.h # Dependencies libkres_DEPEND := $(contrib) diff --git a/lib/resolve.h b/lib/resolve.h index f67ee54ab..04f2a11e1 100644 --- a/lib/resolve.h +++ b/lib/resolve.h @@ -28,7 +28,7 @@ #include "lib/nsrep.h" #include "lib/rplan.h" #include "lib/module.h" -#include "lib/cache.h" +#include "lib/cache/api.h" /** * @file resolve.h diff --git a/lib/rplan.c b/lib/rplan.c index 0a4f8e099..e18d96a13 100644 --- a/lib/rplan.c +++ b/lib/rplan.c @@ -19,7 +19,7 @@ #include "lib/rplan.h" #include "lib/resolve.h" -#include "lib/cache.h" +#include "lib/cache/api.h" #include "lib/defines.h" #include "lib/layer.h" diff --git a/lib/rplan.h b/lib/rplan.h index 1e45f4576..52b3e242c 100644 --- a/lib/rplan.h +++ b/lib/rplan.h @@ -20,7 +20,7 @@ #include #include -#include "lib/cache.h" +#include "lib/cache/api.h" #include "lib/zonecut.h" #include "lib/nsrep.h" diff --git a/lib/zonecut.h b/lib/zonecut.h index 0cee82fb1..8d48a6f75 100644 --- a/lib/zonecut.h +++ b/lib/zonecut.h @@ -19,7 +19,7 @@ #include "lib/generic/map.h" #include "lib/generic/pack.h" #include "lib/defines.h" -#include "lib/cache.h" +#include "lib/cache/api.h" struct kr_rplan; struct kr_context; diff --git a/modules/memcached/cdb_memcached.c b/modules/memcached/cdb_memcached.c index 0290a26ad..4832cfea3 100644 --- a/modules/memcached/cdb_memcached.c +++ b/modules/memcached/cdb_memcached.c @@ -27,8 +27,8 @@ #include "contrib/cleanup.h" #include "lib/generic/array.h" -#include "lib/cdb.h" -#include "lib/cache.h" +#include "lib/cache/cdb_api.h" +#include "lib/cache/api.h" #include "lib/utils.h" /* memcached client */ diff --git a/modules/memcached/memcached.c b/modules/memcached/memcached.c index acb31fb23..dfd85aeac 100644 --- a/modules/memcached/memcached.c +++ b/modules/memcached/memcached.c @@ -17,9 +17,9 @@ #include #include "daemon/engine.h" -#include "lib/cdb.h" +#include "lib/cache/cdb_api.h" #include "lib/module.h" -#include "lib/cache.h" +#include "lib/cache/api.h" /** @internal Redis API */ const struct kr_cdb_api *cdb_memcached(void); diff --git a/modules/redis/cdb_redis.c b/modules/redis/cdb_redis.c index 262c0f93d..e3f1ab874 100644 --- a/modules/redis/cdb_redis.c +++ b/modules/redis/cdb_redis.c @@ -28,7 +28,7 @@ #include "contrib/ucw/lib.h" -#include "lib/cdb.h" +#include "lib/cache/cdb_api.h" #include "lib/cache.h" #include "lib/utils.h" #include "lib/defines.h" diff --git a/tests/test_cache.c b/tests/test_cache.c index e2c756073..47dafc500 100644 --- a/tests/test_cache.c +++ b/tests/test_cache.c @@ -21,7 +21,7 @@ #include "tests/test.h" #include "lib/cache.h" -#include "lib/cdb_lmdb.h" +#include "lib/cache/cdb_lmdb.h"