The branch, master has been updated via 1c00533 ctdb-build: Remove unnecessary lib/util include path from tests via 68fe0dd ctdb-util: Clean up dependencies via 9726e17 ctdb-includes: Remove some unnecessary declarations from 0c53b29 vfs_acl_common: dacl size must be updated
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1c00533bc0695117cc234d272ec3e0c8c19d3932 Author: Martin Schwenke <mar...@meltin.net> Date: Wed Sep 10 13:57:58 2014 +1000 ctdb-build: Remove unnecessary lib/util include path from tests Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> Autobuild-User(master): Amitay Isaacs <ami...@samba.org> Autobuild-Date(master): Thu Sep 11 06:22:33 CEST 2014 on sn-devel-104 commit 68fe0dddbd9a69091319e72564372cec49037bd1 Author: Martin Schwenke <mar...@meltin.net> Date: Wed Sep 10 13:57:12 2014 +1000 ctdb-util: Clean up dependencies Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> commit 9726e17e366382776c87a8aaa63884665c604896 Author: Martin Schwenke <mar...@meltin.net> Date: Fri Sep 5 16:09:34 2014 +1000 ctdb-includes: Remove some unnecessary declarations To accommodate removing file_lines_load() from here, drop the #ifdef around the declaration in util.h. Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> ----------------------------------------------------------------------- Summary of changes: ctdb/include/internal/includes.h | 3 --- ctdb/lib/util/util.h | 2 -- ctdb/lib/util/wscript_build | 3 +-- ctdb/wscript | 6 +++--- 4 files changed, 4 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h index e3e153b..78eba55 100644 --- a/ctdb/include/internal/includes.h +++ b/ctdb/include/internal/includes.h @@ -47,9 +47,6 @@ struct timeval timeval_until(const struct timeval *tv1, const struct timeval *tv2); _PUBLIC_ struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs); double timeval_elapsed(struct timeval *tv); -char **file_lines_load(const char *fname, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx); -char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len); -_PUBLIC_ int set_blocking(int fd, bool set); #include "lib/util/debug.h" #include "lib/util/util.h" diff --git a/ctdb/lib/util/util.h b/ctdb/lib/util/util.h index 211c5b2..abf5c46 100644 --- a/ctdb/lib/util/util.h +++ b/ctdb/lib/util/util.h @@ -319,13 +319,11 @@ mmap (if possible) or read a file **/ _PUBLIC_ void *map_file(const char *fname, size_t size); -#ifdef _SAMBA_BUILD_ /** load a file into memory and return an array of pointers to lines in the file must be freed with talloc_free(). **/ _PUBLIC_ char **file_lines_load(const char *fname, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx); -#endif /** load a fd into memory and return an array of pointers to lines in the file diff --git a/ctdb/lib/util/wscript_build b/ctdb/lib/util/wscript_build index 89e6958..0d94539 100755 --- a/ctdb/lib/util/wscript_build +++ b/ctdb/lib/util/wscript_build @@ -4,7 +4,6 @@ bld.SAMBA_SUBSYSTEM('ctdb-util', source='''util.c util_file.c util_time.c debug.c fault.c idtree.c signal.c substitute.c''', - deps='tdb talloc', - public_deps='talloc tevent', + deps='tdb talloc tevent', local_include=False, ) diff --git a/ctdb/wscript b/ctdb/wscript index 7c791ff..98a57ae 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -456,21 +456,21 @@ def build(bld): deps='''replace popt tdb tevent talloc ctdb-system ctdb-util tdb-wrap''' + ib_deps, - includes='include include/internal lib/util', + includes='include include/internal', install_path='${CTDB_TEST_LIBDIR}') bld.SAMBA_BINARY('ctdb_functest', source='tests/src/ctdb_functest.c', deps='''replace tdb tevent talloc popt ctdb-system ctdb-util tdb-wrap''', - includes='include include/internal lib/util', + includes='include include/internal', install_path='${CTDB_TEST_LIBDIR}') bld.SAMBA_BINARY('ctdb_stubtest', source='tests/src/ctdb_test.c', deps='''replace tdb tevent talloc popt ctdb-system ctdb-util tdb-wrap''', - includes='include include/internal lib/util', + includes='include include/internal', install_path='${CTDB_TEST_LIBDIR}') if bld.env.HAVE_INFINIBAND: -- Samba Shared Repository