summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/smbcquotas.c6
-rw-r--r--source3/utils/status_profile.c12
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;