sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ctdb-includes: Remove some unnecessary declarations

Browse Source 
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>
This commit is contained in:
Martin Schwenke 2014-09-05 16:09:34 +10:00 committed by Amitay Isaacs
parent 0c53b293ab
commit 9726e17e36
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ctdb/include/internal/includes.h
View File

@ -47,9 +47,6 @@ struct timeval timeval_until(const struct timeval *tv1,
const struct timeval *tv2); const struct timeval *tv2);
_PUBLIC_ struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs); _PUBLIC_ struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs);
double timeval_elapsed(struct timeval *tv); 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/debug.h"
#include "lib/util/util.h" #include "lib/util/util.h"

2
ctdb/lib/util/util.h
View File

@ -319,13 +319,11 @@ mmap (if possible) or read a file
**/ **/
_PUBLIC_ void *map_file(const char *fname, size_t size); _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 load a file into memory and return an array of pointers to lines in the file
must be freed with talloc_free(). must be freed with talloc_free().
**/ **/
_PUBLIC_ char **file_lines_load(const char *fname, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx); _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 load a fd into memory and return an array of pointers to lines in the file