aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2024-04-22 15:25:43 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2024-04-25 14:15:32 +0100
commita776d524e1fcc4395d66ad102c1d499fa95d0cce (patch)
tree5609575cde2e9bf5d935291396cd4d7f63471819
parentfa006246932f600de91ff63ba0a6ef71c2619ca7 (diff)
downloadffmpeg-a776d524e1fcc4395d66ad102c1d499fa95d0cce.tar.gz
avformat/http: Rename attempts to auth_attempts
This accurately reflects what it does, as per e75bbcf493aeb549d04c56f49406aeee3950d93b. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rw-r--r--libavformat/http.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/http.c b/libavformat/http.c
index 0e99aa2448..8592ef5264 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -356,7 +356,7 @@ static int http_open_cnx(URLContext *h, AVDictionary **options)
{
HTTPAuthType cur_auth_type, cur_proxy_auth_type;
HTTPContext *s = h->priv_data;
- int ret, attempts = 0, redirects = 0;
+ int ret, auth_attempts = 0, redirects = 0;
int reconnect_delay = 0;
uint64_t off;
char *cached;
@@ -399,10 +399,10 @@ redo:
goto redo;
}
- attempts++;
+ auth_attempts++;
if (s->http_code == 401) {
if ((cur_auth_type == HTTP_AUTH_NONE || s->auth_state.stale) &&
- s->auth_state.auth_type != HTTP_AUTH_NONE && attempts < 4) {
+ s->auth_state.auth_type != HTTP_AUTH_NONE && auth_attempts < 4) {
ffurl_closep(&s->hd);
goto redo;
} else
@@ -410,7 +410,7 @@ redo:
}
if (s->http_code == 407) {
if ((cur_proxy_auth_type == HTTP_AUTH_NONE || s->proxy_auth_state.stale) &&
- s->proxy_auth_state.auth_type != HTTP_AUTH_NONE && attempts < 4) {
+ s->proxy_auth_state.auth_type != HTTP_AUTH_NONE && auth_attempts < 4) {
ffurl_closep(&s->hd);
goto redo;
} else
@@ -439,7 +439,7 @@ redo:
/* Restart the authentication process with the new target, which
* might use a different auth mechanism. */
memset(&s->auth_state, 0, sizeof(s->auth_state));
- attempts = 0;
+ auth_attempts = 0;
goto redo;
}
return 0;
@@ -2071,7 +2071,7 @@ static int http_proxy_open(URLContext *h, const char *uri, int flags)
char hostname[1024], hoststr[1024];
char auth[1024], pathbuf[1024], *path;
char lower_url[100];
- int port, ret = 0, attempts = 0;
+ int port, ret = 0, auth_attempts = 0;
HTTPAuthType cur_auth_type;
char *authstr;
@@ -2131,10 +2131,10 @@ redo:
if (ret < 0)
goto fail;
- attempts++;
+ auth_attempts++;
if (s->http_code == 407 &&
(cur_auth_type == HTTP_AUTH_NONE || s->proxy_auth_state.stale) &&
- s->proxy_auth_state.auth_type != HTTP_AUTH_NONE && attempts < 2) {
+ s->proxy_auth_state.auth_type != HTTP_AUTH_NONE && auth_attempts < 2) {
ffurl_closep(&s->hd);
goto redo;
}