From 0f41792dc597854f0d53c25c2975f542dd812711 Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Fri, 22 Nov 2013 05:18:36 +0100 Subject: [PATCH] lib/ntdb optimize includes in ntdb tests use the private header (which will use libreplace or system headers) instead of direct includes of system includes Signed-off-by: Christian Ambach Reviewed-by: Rusty Russell --- lib/ntdb/test/api-12-store.c | 4 +--- lib/ntdb/test/api-13-delete.c | 3 --- lib/ntdb/test/api-14-exists.c | 4 +--- lib/ntdb/test/api-16-wipe_all.c | 4 +--- lib/ntdb/test/api-20-alloc-attr.c | 4 +--- lib/ntdb/test/api-21-parse_record.c | 4 +--- lib/ntdb/test/api-55-transaction.c | 3 --- lib/ntdb/test/api-60-noop-transaction.c | 3 --- lib/ntdb/test/api-80-tdb_fd.c | 4 +--- lib/ntdb/test/api-81-seqnum.c | 4 +--- lib/ntdb/test/api-82-lockattr.c | 3 --- lib/ntdb/test/api-83-openhook.c | 8 +------- lib/ntdb/test/api-91-get-stats.c | 6 +----- lib/ntdb/test/api-92-get-set-readonly.c | 4 +--- lib/ntdb/test/api-93-repack.c | 4 +--- lib/ntdb/test/api-94-expand-during-parse.c | 3 --- lib/ntdb/test/api-95-read-only-during-parse.c | 4 +--- lib/ntdb/test/api-add-remove-flags.c | 3 --- lib/ntdb/test/api-check-callback.c | 4 +--- lib/ntdb/test/api-firstkey-nextkey.c | 5 +---- lib/ntdb/test/api-fork-test.c | 8 +------- lib/ntdb/test/api-locktimeout.c | 7 +------ lib/ntdb/test/api-missing-entries.c | 4 +--- lib/ntdb/test/api-open-multiple-times.c | 3 --- lib/ntdb/test/api-record-expand.c | 5 +---- lib/ntdb/test/api-simple-delete.c | 4 +--- lib/ntdb/test/api-summary.c | 5 +---- 27 files changed, 20 insertions(+), 97 deletions(-) diff --git a/lib/ntdb/test/api-12-store.c b/lib/ntdb/test/api-12-store.c index 45274e0c67d..532a8ee5c82 100644 --- a/lib/ntdb/test/api-12-store.c +++ b/lib/ntdb/test/api-12-store.c @@ -1,10 +1,8 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" #include -#include -#include -#include #include "logging.h" diff --git a/lib/ntdb/test/api-13-delete.c b/lib/ntdb/test/api-13-delete.c index cded8fde0bd..730ade5afbb 100644 --- a/lib/ntdb/test/api-13-delete.c +++ b/lib/ntdb/test/api-13-delete.c @@ -1,8 +1,5 @@ #include "private.h" // For NTDB_TOPLEVEL_HASH_BITS #include -#include -#include -#include #include "ntdb.h" #include "tap-interface.h" #include "logging.h" diff --git a/lib/ntdb/test/api-14-exists.c b/lib/ntdb/test/api-14-exists.c index abaaae0ee54..c40d9016cfb 100644 --- a/lib/ntdb/test/api-14-exists.c +++ b/lib/ntdb/test/api-14-exists.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" static bool test_records(struct ntdb_context *ntdb) diff --git a/lib/ntdb/test/api-16-wipe_all.c b/lib/ntdb/test/api-16-wipe_all.c index 6a6075275eb..4eea151e5d1 100644 --- a/lib/ntdb/test/api-16-wipe_all.c +++ b/lib/ntdb/test/api-16-wipe_all.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" static bool add_records(struct ntdb_context *ntdb) diff --git a/lib/ntdb/test/api-20-alloc-attr.c b/lib/ntdb/test/api-20-alloc-attr.c index e4ec89a334f..3df5003af78 100644 --- a/lib/ntdb/test/api-20-alloc-attr.c +++ b/lib/ntdb/test/api-20-alloc-attr.c @@ -1,10 +1,8 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" #include -#include -#include -#include #include #include "logging.h" diff --git a/lib/ntdb/test/api-21-parse_record.c b/lib/ntdb/test/api-21-parse_record.c index 975bbfaf1c9..5af9abe00fe 100644 --- a/lib/ntdb/test/api-21-parse_record.c +++ b/lib/ntdb/test/api-21-parse_record.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" static enum NTDB_ERROR parse(NTDB_DATA key, NTDB_DATA data, NTDB_DATA *expected) diff --git a/lib/ntdb/test/api-55-transaction.c b/lib/ntdb/test/api-55-transaction.c index 01a1dcea1b8..3d3e53998ea 100644 --- a/lib/ntdb/test/api-55-transaction.c +++ b/lib/ntdb/test/api-55-transaction.c @@ -1,9 +1,6 @@ #include "private.h" // struct ntdb_context #include "ntdb.h" #include "tap-interface.h" -#include -#include -#include #include #include "logging.h" diff --git a/lib/ntdb/test/api-60-noop-transaction.c b/lib/ntdb/test/api-60-noop-transaction.c index a429e679074..5e56dbc521b 100644 --- a/lib/ntdb/test/api-60-noop-transaction.c +++ b/lib/ntdb/test/api-60-noop-transaction.c @@ -1,9 +1,6 @@ #include "private.h" // struct ntdb_context #include "ntdb.h" #include "tap-interface.h" -#include -#include -#include #include #include "logging.h" diff --git a/lib/ntdb/test/api-80-tdb_fd.c b/lib/ntdb/test/api-80-tdb_fd.c index 81b7284749e..ca520a9967d 100644 --- a/lib/ntdb/test/api-80-tdb_fd.c +++ b/lib/ntdb/test/api-80-tdb_fd.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/ntdb/test/api-81-seqnum.c b/lib/ntdb/test/api-81-seqnum.c index 04f49cdbe3d..45963ff5a6f 100644 --- a/lib/ntdb/test/api-81-seqnum.c +++ b/lib/ntdb/test/api-81-seqnum.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include #include "logging.h" diff --git a/lib/ntdb/test/api-82-lockattr.c b/lib/ntdb/test/api-82-lockattr.c index 4fbe1d232a6..f71600c182b 100644 --- a/lib/ntdb/test/api-82-lockattr.c +++ b/lib/ntdb/test/api-82-lockattr.c @@ -1,9 +1,6 @@ #include "private.h" // for ntdb_fcntl_unlock #include "ntdb.h" #include "tap-interface.h" -#include -#include -#include #include #include "logging.h" diff --git a/lib/ntdb/test/api-83-openhook.c b/lib/ntdb/test/api-83-openhook.c index 3816eef209c..d2930acf552 100644 --- a/lib/ntdb/test/api-83-openhook.c +++ b/lib/ntdb/test/api-83-openhook.c @@ -1,13 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include -#include -#include -#include -#include #include "external-agent.h" #include "logging.h" diff --git a/lib/ntdb/test/api-91-get-stats.c b/lib/ntdb/test/api-91-get-stats.c index 1ed36f028da..1041cba53b5 100644 --- a/lib/ntdb/test/api-91-get-stats.c +++ b/lib/ntdb/test/api-91-get-stats.c @@ -1,11 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include -#include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/ntdb/test/api-92-get-set-readonly.c b/lib/ntdb/test/api-92-get-set-readonly.c index 81eadff3232..c557f34cf99 100644 --- a/lib/ntdb/test/api-92-get-set-readonly.c +++ b/lib/ntdb/test/api-92-get-set-readonly.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/ntdb/test/api-93-repack.c b/lib/ntdb/test/api-93-repack.c index 4a30c57edfa..0fade08224f 100644 --- a/lib/ntdb/test/api-93-repack.c +++ b/lib/ntdb/test/api-93-repack.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" #define NUM_TESTS 1000 diff --git a/lib/ntdb/test/api-94-expand-during-parse.c b/lib/ntdb/test/api-94-expand-during-parse.c index 4963e47fe7e..3aca88bd78b 100644 --- a/lib/ntdb/test/api-94-expand-during-parse.c +++ b/lib/ntdb/test/api-94-expand-during-parse.c @@ -2,9 +2,6 @@ #include "config.h" #include "ntdb.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" #include "../private.h" /* To establish size, esp. for NTDB_INTERNAL dbs */ diff --git a/lib/ntdb/test/api-95-read-only-during-parse.c b/lib/ntdb/test/api-95-read-only-during-parse.c index 8252b812d22..53adbc3ceb7 100644 --- a/lib/ntdb/test/api-95-read-only-during-parse.c +++ b/lib/ntdb/test/api-95-read-only-during-parse.c @@ -1,10 +1,8 @@ /* Make sure write operations fail during ntdb_parse(). */ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" static struct ntdb_context *ntdb; diff --git a/lib/ntdb/test/api-add-remove-flags.c b/lib/ntdb/test/api-add-remove-flags.c index c5a3f421fc9..c16ceeb2f6a 100644 --- a/lib/ntdb/test/api-add-remove-flags.c +++ b/lib/ntdb/test/api-add-remove-flags.c @@ -1,9 +1,6 @@ #include "private.h" // for ntdb_context #include "ntdb.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/ntdb/test/api-check-callback.c b/lib/ntdb/test/api-check-callback.c index b5ca8a057c1..20c88e7175b 100644 --- a/lib/ntdb/test/api-check-callback.c +++ b/lib/ntdb/test/api-check-callback.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" #define NUM_RECORDS 1000 diff --git a/lib/ntdb/test/api-firstkey-nextkey.c b/lib/ntdb/test/api-firstkey-nextkey.c index 5e83e6bf77d..179cf76c8e2 100644 --- a/lib/ntdb/test/api-firstkey-nextkey.c +++ b/lib/ntdb/test/api-firstkey-nextkey.c @@ -1,10 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include -#include #include "logging.h" #define NUM_RECORDS 1000 diff --git a/lib/ntdb/test/api-fork-test.c b/lib/ntdb/test/api-fork-test.c index 6298a4af018..4b114d6f60b 100644 --- a/lib/ntdb/test/api-fork-test.c +++ b/lib/ntdb/test/api-fork-test.c @@ -12,14 +12,8 @@ */ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include -#include -#include -#include -#include #include "logging.h" static bool am_child = false; diff --git a/lib/ntdb/test/api-locktimeout.c b/lib/ntdb/test/api-locktimeout.c index 5e24d58dc43..4c0fda28974 100644 --- a/lib/ntdb/test/api-locktimeout.c +++ b/lib/ntdb/test/api-locktimeout.c @@ -1,13 +1,8 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include "system/wait.h" -#include -#include -#include -#include #include -#include #include "logging.h" #include "external-agent.h" diff --git a/lib/ntdb/test/api-missing-entries.c b/lib/ntdb/test/api-missing-entries.c index d9a1fd97d5a..2a00f1b33e8 100644 --- a/lib/ntdb/test/api-missing-entries.c +++ b/lib/ntdb/test/api-missing-entries.c @@ -1,11 +1,9 @@ /* Another test revealed that we lost an entry. This reproduces it. */ #include "config.h" #include "ntdb.h" +#include "private.h" #include #include "tap-interface.h" -#include -#include -#include #include "logging.h" #define NUM_RECORDS 1189 diff --git a/lib/ntdb/test/api-open-multiple-times.c b/lib/ntdb/test/api-open-multiple-times.c index 8663b8a24c4..6b97bc9718b 100644 --- a/lib/ntdb/test/api-open-multiple-times.c +++ b/lib/ntdb/test/api-open-multiple-times.c @@ -1,9 +1,6 @@ #include "config.h" #include "ntdb.h" #include "tap-interface.h" -#include -#include -#include #include #include "logging.h" #include "../private.h" diff --git a/lib/ntdb/test/api-record-expand.c b/lib/ntdb/test/api-record-expand.c index 8786fc7e5c4..74fb27fc47b 100644 --- a/lib/ntdb/test/api-record-expand.c +++ b/lib/ntdb/test/api-record-expand.c @@ -1,10 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include -#include #include "logging.h" #define MAX_SIZE 10000 diff --git a/lib/ntdb/test/api-simple-delete.c b/lib/ntdb/test/api-simple-delete.c index dedc433d1fc..e8baf4c5166 100644 --- a/lib/ntdb/test/api-simple-delete.c +++ b/lib/ntdb/test/api-simple-delete.c @@ -1,9 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/ntdb/test/api-summary.c b/lib/ntdb/test/api-summary.c index df5d092a60b..af1b59581f8 100644 --- a/lib/ntdb/test/api-summary.c +++ b/lib/ntdb/test/api-summary.c @@ -1,10 +1,7 @@ #include "config.h" #include "ntdb.h" +#include "private.h" #include "tap-interface.h" -#include -#include -#include -#include #include "logging.h" int main(int argc, char *argv[]) -- 2.11.4.GIT