diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 14:27:08 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 14:27:08 +0200 |
| commit | e09c0c1185b4a4ad1d28023549074875028f3e55 (patch) | |
| tree | 158cd066a2dd19169748a6d94fc990953d49b6c9 /lib/util/util.h | |
| parent | 33032d591f8e39edae0ce4b35ca1b6e25f04a04b (diff) | |
| parent | 085e7b0b6cc882b31c11b6d6ea7834235588e1ed (diff) | |
| download | samba-e09c0c1185b4a4ad1d28023549074875028f3e55.tar.gz samba-e09c0c1185b4a4ad1d28023549074875028f3e55.tar.bz2 samba-e09c0c1185b4a4ad1d28023549074875028f3e55.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
Diffstat (limited to 'lib/util/util.h')
| -rw-r--r-- | lib/util/util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util/util.h b/lib/util/util.h index 47adf067f0..4c9a223093 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -236,12 +236,12 @@ _PUBLIC_ char *safe_strcat(char *dest, const char *src, size_t maxlength); **/ -_PUBLIC_ size_t strhex_to_str(char *p, size_t len, const char *strhex); +_PUBLIC_ size_t strhex_to_str(char *p, size_t p_len, const char *strhex, size_t strhex_len); /** * Parse a hex string and return a data blob. */ -_PUBLIC_ _PURE_ DATA_BLOB strhex_to_data_blob(const char *strhex) ; +_PUBLIC_ _PURE_ DATA_BLOB strhex_to_data_blob(TALLOC_CTX *mem_ctx, const char *strhex) ; /** * Routine to print a buffer as HEX digits, into an allocated string. |