diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-07-10 18:13:47 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-07-10 18:13:47 +1000 |
| commit | f97f2946d25f08b552466f42412a960bd13769d7 (patch) | |
| tree | 5f675656b97cceeb33ad3e40a2dbfc9fd86af409 /ctdb/include/includes.h | |
| parent | a4c96397f59232219ddc1c79333093c2fcbbd2ef (diff) | |
| download | samba-f97f2946d25f08b552466f42412a960bd13769d7.tar.gz samba-f97f2946d25f08b552466f42412a960bd13769d7.tar.xz samba-f97f2946d25f08b552466f42412a960bd13769d7.zip | |
minor back-merge from samba4
(This used to be ctdb commit c591f9b2d2847f440702e7264c7da2fd6d69f4be)
Diffstat (limited to 'ctdb/include/includes.h')
| -rw-r--r-- | ctdb/include/includes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/include/includes.h b/ctdb/include/includes.h index a345fa2e81..b33542a0bc 100644 --- a/ctdb/include/includes.h +++ b/ctdb/include/includes.h @@ -34,7 +34,7 @@ struct timeval timeval_until(const struct timeval *tv1, _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, TALLOC_CTX *mem_ctx); -char *hex_encode(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len); +char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len); _PUBLIC_ const char **str_list_add(const char **list, const char *s); _PUBLIC_ int set_blocking(int fd, BOOL set); |