sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-04 16:58:42 +03:00
Code

r1228: use int64_t instead of long long

Browse Source 
(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)
This commit is contained in:
Stefan Metzmacher 2004-06-23 15:22:41 +00:00 committed by Gerald (Jerry) Carter
parent 1f1a511a27
commit 121e074232
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/lib/time.c
View File

@ -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);
}

4
source4/torture/basic/denytest.c
View File

@ -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;

6
source4/torture/torture.c
View File

@ -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));