git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbd296f
)
r16047: Remove unnecessary line, as this value is set in either branch of the
author
Jim McDonough
<jmcd@samba.org>
Mon, 5 Jun 2006 16:59:10 +0000
(16:59 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 16:17:18 +0000
(11:17 -0500)
'if' below. Spotted by Aleksey Fedoseev.
(This used to be commit
00eb42791abf3e34dc42a2067f07b8549ea31abb
)
source3/lib/time.c
patch
|
blob
|
history
diff --git
a/source3/lib/time.c
b/source3/lib/time.c
index 749af37cae01a965af9d9c702e3dda13634ef340..f8a1538910c49c5baf80da748264b1cd1b7936c6 100644
(file)
--- a/
source3/lib/time.c
+++ b/
source3/lib/time.c
@@
-153,7
+153,6
@@
void get_process_uptime(struct timeval *ret_time)
GetTimeOfDay(&time_now_hires);
ret_time->tv_sec = time_now_hires.tv_sec - start_time_hires.tv_sec;
- ret_time->tv_usec = time_now_hires.tv_usec - start_time_hires.tv_usec;
if (time_now_hires.tv_usec < start_time_hires.tv_usec) {
ret_time->tv_sec -= 1;
ret_time->tv_usec = 1000000 + (time_now_hires.tv_usec - start_time_hires.tv_usec);