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/utils | |
| 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/utils')
| -rw-r--r-- | source3/utils/smbcquotas.c | 6 | ||||
| -rw-r--r-- | source3/utils/status_profile.c | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c index 11f8776a0e..b769c2bce0 100644 --- a/source3/utils/smbcquotas.c +++ b/source3/utils/smbcquotas.c @@ -180,11 +180,7 @@ static int parse_quota_set(TALLOC_CTX *ctx, switch (todo) { case PARSE_LIM: -#if defined(HAVE_LONGLONG) - if (sscanf(p,"%llu/%llu",&pqt->softlim,&pqt->hardlim)!=2) { -#else - if (sscanf(p,"%lu/%lu",&pqt->softlim,&pqt->hardlim)!=2) { -#endif + if (sscanf(p,"%"PRIu64"/%"PRIu64,&pqt->softlim,&pqt->hardlim)!=2) { return -1; } diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c index 48814fedea..a51537d3da 100644 --- a/source3/utils/status_profile.c +++ b/source3/utils/status_profile.c @@ -423,12 +423,12 @@ bool status_profile_dump(bool verbose) static int print_count_samples( const struct profile_stats * const current, const struct profile_stats * const last, - SMB_BIG_UINT delta_usec) + uint64_t delta_usec) { int i; int count = 0; unsigned step; - SMB_BIG_UINT spent; + uint64_t spent; int delta_sec; const char * name; char buf[40]; @@ -467,13 +467,13 @@ static int print_count_samples( } static struct profile_stats sample_data[2]; -static SMB_BIG_UINT sample_time[2]; +static uint64_t sample_time[2]; bool status_profile_rates(bool verbose) { - SMB_BIG_UINT remain_usec; - SMB_BIG_UINT next_usec; - SMB_BIG_UINT delta_usec; + uint64_t remain_usec; + uint64_t next_usec; + uint64_t delta_usec; int last = 0; int current = 1; |