diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-06-23 15:22:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:45 -0500 |
| commit | 121e074232439817bd2467d847c93885b40e13b7 (patch) | |
| tree | c00324b36fcf3553fbbdad90d0bf398a3449e595 | |
| parent | 1f1a511a278d9f019d50f815b46c1491a97ecdd9 (diff) | |
| download | samba-121e074232439817bd2467d847c93885b40e13b7.tar.gz samba-121e074232439817bd2467d847c93885b40e13b7.tar.bz2 samba-121e074232439817bd2467d847c93885b40e13b7.zip | |
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)
| -rw-r--r-- | source4/lib/time.c | 6 | ||||
| -rw-r--r-- | source4/torture/basic/denytest.c | 4 | ||||
| -rw-r--r-- | source4/torture/torture.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/time.c b/source4/lib/time.c index 9d906af2fa..bd8d7ddb30 100644 --- a/source4/lib/time.c +++ b/source4/lib/time.c @@ -410,9 +410,9 @@ NTTIME nttime_from_string(const char *s) return strtoull(s, NULL, 0); } -long long usec_time_diff(struct timeval *larget, struct timeval *smallt) +int64_t usec_time_diff(struct timeval *larget, struct timeval *smallt) { - long long sec_diff = larget->tv_sec - smallt->tv_sec; - return (sec_diff * 1000000) + (long long)(larget->tv_usec - smallt->tv_usec); + int64_t sec_diff = larget->tv_sec - smallt->tv_sec; + return (sec_diff * 1000000) + (int64_t)(larget->tv_usec - smallt->tv_usec); } 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)); |