From 121e074232439817bd2467d847c93885b40e13b7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 23 Jun 2004 15:22:41 +0000 Subject: r1228: use int64_t instead of long long (jra: please use: void, char int, uint_t, [u]int<8|16|32|64>_t types in new code) metze (This used to be commit 626bb153c45405f93a96bc5019241af506fac163) --- source4/torture/basic/denytest.c | 4 ++-- source4/torture/torture.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index 13cb38633c..ec4a835240 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -1464,7 +1464,7 @@ BOOL torture_denytest1(int dummy) } if (torture_showall || res != denytable1[i].result) { - long long tdif; + int64_t tdif; GetTimeOfDay(&tv); tdif = usec_time_diff(&tv, &tv_start); tdif /= 1000; @@ -1558,7 +1558,7 @@ BOOL torture_denytest2(int dummy) } if (torture_showall || res != denytable2[i].result) { - long long tdif; + int64_t tdif; GetTimeOfDay(&tv); tdif = usec_time_diff(&tv, &tv_start); tdif /= 1000; diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 2bb68fcce8..1610445d72 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -1790,11 +1790,11 @@ static BOOL run_deferopen(struct cli_state *cli, int dummy) GetTimeOfDay(&tv_end); if (NT_STATUS_EQUAL(cli_nt_error(cli->tree),NT_STATUS_SHARING_VIOLATION)) { /* Sharing violation errors need to be 1 second apart. */ - long long tdif = usec_time_diff(&tv_end, &tv_start); + int64_t tdif = usec_time_diff(&tv_end, &tv_start); if (tdif < 500000 || tdif > 1500000) { fprintf(stderr,"Timing incorrect %lld.%lld for share violation\n", - tdif / (long long)1000000, - tdif % (long long)1000000); + tdif / (int64_t)1000000, + tdif % (int64_t)1000000); } } } while (NT_STATUS_EQUAL(cli_nt_error(cli->tree),NT_STATUS_SHARING_VIOLATION)); -- cgit