[FFmpeg-cvslog] http: K&R formatting cosmetics
Luca Barbato
git at videolan.org
Sun Mar 16 03:38:00 CET 2014
ffmpeg | branch: release/2.2 | Luca Barbato <lu_zero at gentoo.org> | Mon Mar 10 18:02:09 2014 +0100| [f1de93dec302cc860c718e89656f184510b2d239] | committer: Reinhard Tartler
http: K&R formatting cosmetics
(cherry picked from commit 7a2fddb4480121712df560cf619c1c3566cae3ff)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1de93dec302cc860c718e89656f184510b2d239
---
libavformat/http.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/libavformat/http.c b/libavformat/http.c
index ce76f27..ba0cf57 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -327,12 +327,11 @@ static int process_line(URLContext *h, char *line, int line_count,
/* error codes are 4xx and 5xx, but regard 401 as a success, so we
* don't abort until all headers have been parsed. */
- if (s->http_code >= 400 && s->http_code < 600 && (s->http_code != 401
- || s->auth_state.auth_type != HTTP_AUTH_NONE) &&
+ if (s->http_code >= 400 && s->http_code < 600 &&
+ (s->http_code != 401 || s->auth_state.auth_type != HTTP_AUTH_NONE) &&
(s->http_code != 407 || s->proxy_auth_state.auth_type != HTTP_AUTH_NONE)) {
end += strspn(end, SPACE_CHARS);
- av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n",
- s->http_code, end);
+ av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n", s->http_code, end);
return AVERROR(EIO);
}
} else {
@@ -356,34 +355,37 @@ static int process_line(URLContext *h, char *line, int line_count,
av_free(s->location);
s->location = new_loc;
*new_location = 1;
- } else if (!av_strcasecmp (tag, "Content-Length") && s->filesize == -1) {
+ } else if (!av_strcasecmp(tag, "Content-Length") && s->filesize == -1) {
s->filesize = strtoll(p, NULL, 10);
- } else if (!av_strcasecmp (tag, "Content-Range")) {
+ } else if (!av_strcasecmp(tag, "Content-Range")) {
/* "bytes $from-$to/$document_size" */
const char *slash;
- if (!strncmp (p, "bytes ", 6)) {
+ if (!strncmp(p, "bytes ", 6)) {
p += 6;
s->off = strtoll(p, NULL, 10);
if ((slash = strchr(p, '/')) && strlen(slash) > 0)
s->filesize = strtoll(slash+1, NULL, 10);
}
h->is_streamed = 0; /* we _can_ in fact seek */
- } else if (!av_strcasecmp(tag, "Accept-Ranges") && !strncmp(p, "bytes", 5)) {
+ } else if (!av_strcasecmp(tag, "Accept-Ranges") &&
+ !strncmp(p, "bytes", 5)) {
h->is_streamed = 0;
- } else if (!av_strcasecmp (tag, "Transfer-Encoding") && !av_strncasecmp(p, "chunked", 7)) {
+ } else if (!av_strcasecmp(tag, "Transfer-Encoding") &&
+ !av_strncasecmp(p, "chunked", 7)) {
s->filesize = -1;
s->chunksize = 0;
- } else if (!av_strcasecmp (tag, "WWW-Authenticate")) {
+ } else if (!av_strcasecmp(tag, "WWW-Authenticate")) {
ff_http_auth_handle_header(&s->auth_state, tag, p);
- } else if (!av_strcasecmp (tag, "Authentication-Info")) {
+ } else if (!av_strcasecmp(tag, "Authentication-Info")) {
ff_http_auth_handle_header(&s->auth_state, tag, p);
- } else if (!av_strcasecmp (tag, "Proxy-Authenticate")) {
+ } else if (!av_strcasecmp(tag, "Proxy-Authenticate")) {
ff_http_auth_handle_header(&s->proxy_auth_state, tag, p);
- } else if (!av_strcasecmp (tag, "Connection")) {
+ } else if (!av_strcasecmp(tag, "Connection")) {
if (!strcmp(p, "close"))
s->willclose = 1;
- } else if (!av_strcasecmp (tag, "Content-Encoding")) {
- if (!av_strncasecmp(p, "gzip", 4) || !av_strncasecmp(p, "deflate", 7)) {
+ } else if (!av_strcasecmp(tag, "Content-Encoding")) {
+ if (!av_strncasecmp(p, "gzip", 4) ||
+ !av_strncasecmp(p, "deflate", 7)) {
#if CONFIG_ZLIB
s->compressed = 1;
inflateEnd(&s->inflate_stream);
More information about the ffmpeg-cvslog
mailing list