Permalink
Browse files

ares_timeout.c: fix compiler warning

  • Loading branch information...
1 parent f7b66af commit 38a9933a6dd6242beaa865e267a575e61aead8d6 @yangtse yangtse committed Apr 25, 2012
Showing with 11 additions and 10 deletions.
  1. +11 −10 ares_timeout.c
View
@@ -62,19 +62,20 @@ struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
min_offset = offset;
}
- if(min_offset != -1) {
- 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
* maxtv (if any), return it. Otherwise go with maxtv.
*/
- if (min_offset != -1 && (!maxtv || ares__timedout(maxtv, &nextstop)))
+ if (min_offset != -1)
{
- *tvbuf = nextstop;
- return tvbuf;
+ nextstop.tv_sec = min_offset/1000;
+ nextstop.tv_usec = (min_offset%1000)*1000;
+
+ if (!maxtv || ares__timedout(maxtv, &nextstop))
+ {
+ *tvbuf = nextstop;
+ return tvbuf;
+ }
}
- else
- return maxtv;
+
+ return maxtv;
}

0 comments on commit 38a9933

Please sign in to comment.