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>

diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h
index e3e153b9a9223d9def28088960836982c697b88a..78eba553c1ff82a0a3e276d1bea49cbb6501b038 100644 (file)
--- 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 211c5b2d6dea4b6e130322a46cdf3a3faa2923f8..abf5c4647d9fcdf06d7f3311f5ec0587344ff169 100644 (file)
--- 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