diff --git a/Knot.files b/Knot.files index f364dccaad656272b557db1cdb163ad30c457fdd..da95d12b2f96d60ff4497720b78848692b7a7092 100644 --- a/Knot.files +++ b/Knot.files @@ -65,14 +65,14 @@ src/libknot/zone/zone-tree.c src/libknot/zone/dname-table.h src/libknot/zone/dname-table.c src/Makefile.am -src/common/slab/malloc.c -src/common/slab/malloc.h src/common/slab/slab.c src/common/slab/slab.h src/common/slab/alloc-common.h src/common/libtap/tap.c src/common/libtap/tap.h src/common/libtap/tap_unit.h +src/common/mempattern.c +src/common/mempattern.h src/common/lists.h src/common/lists.c src/common/base32.h diff --git a/src/Makefile.am b/src/Makefile.am index e73b2bfb4d020fc6dfed9b58f3b2e70ed7496dc8..7f39547404f41bdda0d02079f185d0b1e99b0356 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -217,12 +217,12 @@ libknot_la_SOURCES = \ libknots_la_SOURCES = \ common/slab/slab.c \ - common/slab/malloc.c \ common/slab/slab.h \ - common/slab/malloc.h \ common/libtap/tap.c \ common/libtap/tap.h \ common/libtap/tap_unit.h \ + common/mempattern.h \ + common/mempattern.c \ common/lists.c \ common/base32.c \ common/lists.h \ diff --git a/src/common/fdset.h b/src/common/fdset.h index ead4d5b41fe4fa9ffc40528549b5696cdc9ac26a..4fbd9bcfec3ec037d505758367eeba3ecfa0b0d4 100644 --- a/src/common/fdset.h +++ b/src/common/fdset.h @@ -34,6 +34,7 @@ #include <stddef.h> #include "skip-list.h" +#include "mempattern.h" /*! \brief Waiting for completion constants. */ enum fdset_wait_t { diff --git a/src/common/slab/malloc.c b/src/common/mempattern.c similarity index 100% rename from src/common/slab/malloc.c rename to src/common/mempattern.c diff --git a/src/common/slab/malloc.h b/src/common/mempattern.h similarity index 98% rename from src/common/slab/malloc.h rename to src/common/mempattern.h index 8946022189196889299b35bf5871aef612b8941a..ae1fa78f28557137f67c2f243c5c902612c6c87a 100644 --- a/src/common/slab/malloc.h +++ b/src/common/mempattern.h @@ -14,7 +14,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ /*! - * \file malloc.h + * \file mempattern.h * * \author Marek Vavrusa <marek.vavrusa@nic.cz> * diff --git a/src/knot/main.c b/src/knot/main.c index ec3c0dfb874e1fcd02d2b9df1108a849bccd2790..e83551c54a420c9302675e079d74beba5d223991 100644 --- a/src/knot/main.c +++ b/src/knot/main.c @@ -71,7 +71,7 @@ void help(int argc, char **argv) " -V, --version Print version of the server.\n" " -h, --help Print help and usage.\n"); } -#include "common/slab/malloc.h" + int main(int argc, char **argv) { // Parse command line arguments diff --git a/src/knot/stat/gatherer.c b/src/knot/stat/gatherer.c index 63b6abe3beebb946874178ce42d68caf0409868a..5b8eab66c7bf8ae7fe971cfca8b0c8ef7af08e2e 100644 --- a/src/knot/stat/gatherer.c +++ b/src/knot/stat/gatherer.c @@ -20,7 +20,7 @@ #include <string.h> #include "knot/stat/stat-common.h" -#include "common/slab/malloc.h" +#include "common/mempattern.h" #include "knot/stat/gatherer.h" gatherer_t *new_gatherer()