aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/multi.c3
-rw-r--r--lib/transfer.c5
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/multi.c b/lib/multi.c
index 06ffbd7b1..9abf339b1 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1793,11 +1793,12 @@ static void singlesocket(struct Curl_multi *multi,
return;
}
+ /* we know (entry != NULL) at this point, see the logic above */
multi->socket_cb(easy->easy_handle,
s,
action,
multi->socket_userp,
- entry ? entry->socketp : NULL);
+ entry->socketp);
entry->action = action; /* store the current action state */
}
diff --git a/lib/transfer.c b/lib/transfer.c
index c466e8716..191d3dc19 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -2057,13 +2057,12 @@ static CURLcode Curl_do_perform(struct SessionHandle *data)
if(rc)
res = rc;
else
- retry = (bool)(newurl?TRUE:FALSE);
+ retry = (newurl?TRUE:FALSE);
if(retry) {
+ /* we know (newurl != NULL) at this point */
res = CURLE_OK;
follow = FOLLOW_RETRY;
- if (!newurl)
- res = CURLE_OUT_OF_MEMORY;
}
else if (res == CURLE_OK) {
/*