[FFmpeg-devel] http: cosmetics: reformat reconnect check for better readability

Submitted by wm4 on Jan. 11, 2018, 1:31 a.m.

Details

Message ID 20180111013114.17648-1-nfxjfg@googlemail.com
State Accepted
Commit 43e1ccfea186080b1c4cb4cd1e59ac1a3c3dc446
Headers show

Commit Message

wm4 Jan. 11, 2018, 1:31 a.m.
The condition was a bit too long, and most editors will break the line
and turn it into an unreadable mess. Move out some of the conditions.

This should not change the behavior.
---
 libavformat/http.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

wm4 Jan. 15, 2018, 11:40 a.m.
On Thu, 11 Jan 2018 02:31:14 +0100
wm4 <nfxjfg@googlemail.com> wrote:

> The condition was a bit too long, and most editors will break the line
> and turn it into an unreadable mess. Move out some of the conditions.
> 
> This should not change the behavior.
> ---
>  libavformat/http.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/libavformat/http.c b/libavformat/http.c
> index 4806b1e59b..f1208fb123 100644
> --- a/libavformat/http.c
> +++ b/libavformat/http.c
> @@ -1448,12 +1448,18 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size)
>          return http_buf_read_compressed(h, buf, size);
>  #endif /* CONFIG_ZLIB */
>      read_ret = http_buf_read(h, buf, size);
> -    while ((read_ret  < 0           && s->reconnect        && (!h->is_streamed || s->reconnect_streamed) && s->filesize > 0 && s->off < s->filesize)
> -        || (read_ret == AVERROR_EOF && s->reconnect_at_eof && (!h->is_streamed || s->reconnect_streamed))) {
> +    while (read_ret < 0) {
>          uint64_t target = h->is_streamed ? 0 : s->off;
>  
>          if (read_ret == AVERROR_EXIT)
> -            return read_ret;
> +            break;
> +
> +        if (h->is_streamed && !s->reconnect_streamed)
> +            break;
> +
> +        if (!(s->reconnect && s->filesize > 0 && s->off < s->filesize) &&
> +            !(s->reconnect_at_eof && read_ret == AVERROR_EOF))
> +            break;
>  
>          if (reconnect_delay > s->reconnect_delay_max)
>              return AVERROR(EIO);

Pushed.

Patch hide | download patch | download mbox

diff --git a/libavformat/http.c b/libavformat/http.c
index 4806b1e59b..f1208fb123 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -1448,12 +1448,18 @@  static int http_read_stream(URLContext *h, uint8_t *buf, int size)
         return http_buf_read_compressed(h, buf, size);
 #endif /* CONFIG_ZLIB */
     read_ret = http_buf_read(h, buf, size);
-    while ((read_ret  < 0           && s->reconnect        && (!h->is_streamed || s->reconnect_streamed) && s->filesize > 0 && s->off < s->filesize)
-        || (read_ret == AVERROR_EOF && s->reconnect_at_eof && (!h->is_streamed || s->reconnect_streamed))) {
+    while (read_ret < 0) {
         uint64_t target = h->is_streamed ? 0 : s->off;
 
         if (read_ret == AVERROR_EXIT)
-            return read_ret;
+            break;
+
+        if (h->is_streamed && !s->reconnect_streamed)
+            break;
+
+        if (!(s->reconnect && s->filesize > 0 && s->off < s->filesize) &&
+            !(s->reconnect_at_eof && read_ret == AVERROR_EOF))
+            break;
 
         if (reconnect_delay > s->reconnect_delay_max)
             return AVERROR(EIO);