diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-10-14 11:16:59 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-10-14 11:16:59 +1100 |
| commit | 551e95502765bae58d5ccf57635e4977b7b47b9b (patch) | |
| tree | d0c797cbc5044a882e1aac6094f661edb2c070d1 /source3/lib/util_str.c | |
| parent | 9dcbddd5c61e8bf2814e97e53e7c518df87661c0 (diff) | |
| parent | 4746f79d50d804b0e9d5d5cc0d4796dee54d052c (diff) | |
| download | samba-551e95502765bae58d5ccf57635e4977b7b47b9b.tar.gz samba-551e95502765bae58d5ccf57635e4977b7b47b9b.tar.bz2 samba-551e95502765bae58d5ccf57635e4977b7b47b9b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source3/lib/util_str.c')
| -rw-r--r-- | source3/lib/util_str.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index b0a7cb072d..5d1893a85b 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -2279,10 +2279,10 @@ char *base64_encode_data_blob(TALLOC_CTX *mem_ctx, DATA_BLOB data) } /* read a SMB_BIG_UINT from a string */ -SMB_BIG_UINT STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr) +uint64_t STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr) { - SMB_BIG_UINT val = -1; + uint64_t val = -1; const char *p = nptr; if (!p) { @@ -2295,11 +2295,7 @@ SMB_BIG_UINT STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr) while (*p && isspace(*p)) p++; -#ifdef LARGE_SMB_OFF_T - sscanf(p,"%llu",&val); -#else /* LARGE_SMB_OFF_T */ - sscanf(p,"%lu",&val); -#endif /* LARGE_SMB_OFF_T */ + sscanf(p,"%"PRIu64,&val); if (entptr) { while (*p && isdigit(*p)) p++; |