diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-12 17:34:43 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-12 17:34:43 +0200 |
commit | 1b99d8fbb591bedb375c1251d5d29a5674e1b74a (patch) | |
tree | 5e4cf4d115081057750349373184ad7df8894e61 /source3/include | |
parent | 652f0e601da0d1d2e2c8b9281bbee9fa399d9877 (diff) | |
download | samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.tar.gz samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.tar.bz2 samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.zip |
Use common util_file code.
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/proto.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 08c1e2c810..0a5c401952 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1362,16 +1362,16 @@ const char *strip_hostname(const char *s); /* The following definitions come from lib/util_file.c */ char *fgets_slash(char *s2,int maxlen,XFILE *f); -char *fd_load(int fd, size_t *psize, size_t maxsize); -char *file_load(const char *fname, size_t *size, size_t maxsize); +char *file_load(const char *fname, size_t *size, size_t maxsize, TALLOC_CTX *mem_ctx); +char **file_lines_parse(char *p, size_t size, int *numlines, TALLOC_CTX *mem_ctx); bool unmap_file(void* start, size_t size); -void *map_file(char *fname, size_t size); -char **file_lines_load(const char *fname, int *numlines, size_t maxsize); -char **fd_lines_load(int fd, int *numlines, size_t maxsize); -char **file_lines_pload(char *syscmd, int *numlines); +void *map_file(const char *fname, size_t size); +char **file_lines_load(const char *fname, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx); +char **fd_lines_load(int fd, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx); +char **file_lines_pload(const char *syscmd, int *numlines); void file_lines_free(char **lines); void file_lines_slashcont(char **lines); -bool file_save(const char *fname, void *packet, size_t length); +bool file_save(const char *fname, const void *packet, size_t length); /* The following definitions come from lib/util_nscd.c */ |