diff options
| author | Martin Storsjö <martin@martin.st> | 2012-06-01 16:30:01 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-06-01 18:38:29 +0300 |
| commit | 5952564185ecb8495bac0c8ea74e1452da6429ce (patch) | |
| tree | b6a583abba88296f30a1689cb9faa4f242808dae /libavformat/http.c | |
| parent | 3cbcfa2decdbe2b223f7f878b03a5f33a41a22f5 (diff) | |
| download | ffmpeg-5952564185ecb8495bac0c8ea74e1452da6429ce.tar.gz | |
http: Simplify code by removing a local variable
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 61266dfb01..6c6ff5cf81 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -103,7 +103,6 @@ static int http_open_cnx(URLContext *h) int port, use_proxy, err, location_changed = 0, redirects = 0, attempts = 0; HTTPAuthType cur_auth_type, cur_proxy_auth_type; HTTPContext *s = h->priv_data; - URLContext *hd = NULL; proxy_path = getenv("http_proxy"); use_proxy = (proxy_path != NULL) && !getenv("no_proxy") && @@ -144,12 +143,10 @@ static int http_open_cnx(URLContext *h) ff_url_join(buf, sizeof(buf), lower_proto, NULL, hostname, port, NULL); if (!s->hd) { - err = ffurl_open(&hd, buf, AVIO_FLAG_READ_WRITE, + err = ffurl_open(&s->hd, buf, AVIO_FLAG_READ_WRITE, &h->interrupt_callback, NULL); if (err < 0) goto fail; - - s->hd = hd; } cur_auth_type = s->auth_state.auth_type; @@ -160,8 +157,8 @@ static int http_open_cnx(URLContext *h) 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) { - ffurl_close(hd); - s->hd = hd = NULL; + ffurl_close(s->hd); + s->hd = NULL; goto redo; } else goto fail; @@ -169,8 +166,8 @@ static int http_open_cnx(URLContext *h) 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) { - ffurl_close(hd); - s->hd = hd = NULL; + ffurl_close(s->hd); + s->hd = NULL; goto redo; } else goto fail; @@ -178,8 +175,8 @@ static int http_open_cnx(URLContext *h) if ((s->http_code == 301 || s->http_code == 302 || s->http_code == 303 || s->http_code == 307) && location_changed == 1) { /* url moved, get next */ - ffurl_close(hd); - s->hd = hd = NULL; + ffurl_close(s->hd); + s->hd = NULL; if (redirects++ >= MAX_REDIRECTS) return AVERROR(EIO); /* Restart the authentication process with the new target, which @@ -191,8 +188,8 @@ static int http_open_cnx(URLContext *h) } return 0; fail: - if (hd) - ffurl_close(hd); + if (s->hd) + ffurl_close(s->hd); s->hd = NULL; return AVERROR(EIO); } |