projects
/
platform
/
upstream
/
c-ares.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6bf4d4e
)
millisecond resolution support followup
author
Yang Tse
<yangsita@gmail.com>
Thu, 15 May 2008 22:57:33 +0000
(22:57 +0000)
committer
Yang Tse
<yangsita@gmail.com>
Thu, 15 May 2008 22:57:33 +0000
(22:57 +0000)
ares_process.c
patch
|
blob
|
history
ares_timeout.c
patch
|
blob
|
history
diff --git
a/ares_process.c
b/ares_process.c
index
eca363a
..
660ad30
100644
(file)
--- a/
ares_process.c
+++ b/
ares_process.c
@@
-110,7
+110,7
@@
int ares__timedout(struct timeval *now,
if(secs > 0)
return 1; /* yes, timed out */
- if(secs <
-1
)
+ if(secs <
0
)
return 0; /* nope, not timed out */
/* if the full seconds were identical, check the sub second parts */
diff --git
a/ares_timeout.c
b/ares_timeout.c
index
ce98491
..
18ef6e8
100644
(file)
--- a/
ares_timeout.c
+++ b/
ares_timeout.c
@@
-64,8
+64,8
@@
struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
}
if(min_offset != -1) {
- nextstop
= now
;
-
ares__timeadd(&now, min_offset)
;
+ nextstop
.tv_sec = min_offset/1000
;
+
nextstop.tv_usec = (min_offset%1000)*1000
;
}
/* If we found a minimum timeout and it's sooner than the one specified in