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:
93a09ea
)
ares_timeout.c: fix compiler warning
author
Yang Tse
<yangsita@gmail.com>
Mon, 10 Dec 2012 15:12:49 +0000
(16:12 +0100)
committer
Yang Tse
<yangsita@gmail.com>
Mon, 10 Dec 2012 15:12:49 +0000
(16:12 +0100)
ares_timeout.c
patch
|
blob
|
history
diff --git
a/ares_timeout.c
b/ares_timeout.c
index
738ad15
..
1dc0283
100644
(file)
--- a/
ares_timeout.c
+++ b/
ares_timeout.c
@@
-16,6
+16,9
@@
#include "ares_setup.h"
#include "ares_setup.h"
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
@@
-67,8
+70,10
@@
struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
*/
if (min_offset != -1)
{
*/
if (min_offset != -1)
{
- nextstop.tv_sec = min_offset/1000;
- nextstop.tv_usec = (min_offset%1000)*1000;
+ int ioffset = (min_offset > (long)INT_MAX) ? INT_MAX : (int)min_offset;
+
+ nextstop.tv_sec = ioffset/1000;
+ nextstop.tv_usec = (ioffset%1000)*1000;
if (!maxtv || ares__timedout(maxtv, &nextstop))
{
if (!maxtv || ares__timedout(maxtv, &nextstop))
{