diff options
author | Martin Schwenke <martin@meltin.net> | 2014-09-05 16:09:34 +1000 |
---|---|---|
committer | Amitay Isaacs <amitay@samba.org> | 2014-09-11 03:56:03 +0200 |
commit | 9726e17e366382776c87a8aaa63884665c604896 (patch) | |
tree | 18801d742d6e8a81065bbb117e5ad4f7a08d75bb | |
parent | 0c53b293ab5c11fd78bccd4ac832ea16df5c3f80 (diff) | |
download | samba-9726e17e366382776c87a8aaa63884665c604896.tar.gz |
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 <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
-rw-r--r-- | ctdb/include/internal/includes.h | 3 | ||||
-rw-r--r-- | ctdb/lib/util/util.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h index e3e153b9a92..78eba553c1f 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 211c5b2d6de..abf5c4647d9 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 |