From bdf17244128fc1c8c5b47273b1f3a6148015b079 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 2 Oct 2008 22:58:09 +0000 Subject: take 2 at fixing compiler warning: argument might be clobbered by `longjmp' or `vfork' --- lib/hostip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/hostip.c') diff --git a/lib/hostip.c b/lib/hostip.c index f8c2be63f..1a5711f55 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -524,7 +524,7 @@ int Curl_resolv_timeout(struct connectdata *conn, const char *hostname, int port, struct Curl_dns_entry **entry, - volatile long timeout) + long timeoutms) { #ifdef USE_ALARM_TIMEOUT #ifdef HAVE_SIGACTION @@ -536,7 +536,7 @@ int Curl_resolv_timeout(struct connectdata *conn, void (*keep_sigact)(int); /* store the old handler here */ #endif /* HAVE_SIGNAL */ #endif /* HAVE_SIGACTION */ - + volatile long timeout; unsigned int prev_alarm=0; struct SessionHandle *data = conn->data; #endif /* USE_ALARM_TIMEOUT */ @@ -548,6 +548,8 @@ int Curl_resolv_timeout(struct connectdata *conn, if (data->set.no_signal) /* Ignore the timeout when signals are disabled */ timeout = 0; + else + timeout = timeoutms; if(timeout && timeout < 1000) /* The alarm() function only provides integer second resolution, so if -- cgit v1.2.3