RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-26 16:51:29 +00:00
Code Issues Projects Releases Wiki Activity

avformat/network: use av_err2str to simplify code

Browse Source 
No need to explicitly specify the buffer here as it is only
ever passed to av_log, so av_err2str can be used.
This commit is contained in:
Marvin Scholz 2024-09-08 21:16:45 +02:00
parent e7126d9648
commit 24711b00c6
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/network.c
View File

@ -287,16 +287,14 @@ int ff_listen_connect(int fd, const struct sockaddr *addr,
if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen)) if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen))
ret = AVUNERROR(ff_neterrno()); ret = AVUNERROR(ff_neterrno());
if (ret != 0) { if (ret != 0) {
char errbuf[100];
ret = AVERROR(ret); ret = AVERROR(ret);
av_strerror(ret, errbuf, sizeof(errbuf));
if (will_try_next) if (will_try_next)
av_log(h, AV_LOG_WARNING, av_log(h, AV_LOG_WARNING,
"Connection to %s failed (%s), trying next address\n", "Connection to %s failed (%s), trying next address\n",
h->filename, errbuf); h->filename, av_err2str(ret));
else else
av_log(h, AV_LOG_ERROR, "Connection to %s failed: %s\n", av_log(h, AV_LOG_ERROR, "Connection to %s failed: %s\n",
h->filename, errbuf); h->filename, av_err2str(ret));
} }
default: default:
return ret; return ret;
@ -421,7 +419,7 @@ int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address,
int64_t next_attempt_us = av_gettime_relative(), next_deadline_us; int64_t next_attempt_us = av_gettime_relative(), next_deadline_us;
int last_err = AVERROR(EIO); int last_err = AVERROR(EIO);
socklen_t optlen; socklen_t optlen;
char errbuf[100], hostbuf[100], portbuf[20]; char hostbuf[100], portbuf[20];
if (parallel > FF_ARRAY_ELEMS(attempts)) if (parallel > FF_ARRAY_ELEMS(attempts))
parallel = FF_ARRAY_ELEMS(attempts); parallel = FF_ARRAY_ELEMS(attempts);
@ -445,9 +443,8 @@ int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address,
timeout_ms_per_address, h, timeout_ms_per_address, h,
customize_fd, customize_ctx); customize_fd, customize_ctx);
if (last_err < 0) { if (last_err < 0) {
av_strerror(last_err, errbuf, sizeof(errbuf));
av_log(h, AV_LOG_VERBOSE, "Connected attempt failed: %s\n", av_log(h, AV_LOG_VERBOSE, "Connected attempt failed: %s\n",
errbuf); av_err2str(last_err));
continue; continue;
} }
if (last_err > 0) { if (last_err > 0) {
@ -511,9 +508,8 @@ int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address,
getnameinfo(attempts[i].addr->ai_addr, attempts[i].addr->ai_addrlen, getnameinfo(attempts[i].addr->ai_addr, attempts[i].addr->ai_addrlen,
hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf), hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf),
NI_NUMERICHOST | NI_NUMERICSERV); NI_NUMERICHOST | NI_NUMERICSERV);
av_strerror(last_err, errbuf, sizeof(errbuf));
av_log(h, AV_LOG_VERBOSE, "Connection attempt to %s port %s " av_log(h, AV_LOG_VERBOSE, "Connection attempt to %s port %s "
"failed: %s\n", hostbuf, portbuf, errbuf); "failed: %s\n", hostbuf, portbuf, av_err2str(last_err));
closesocket(attempts[i].fd); closesocket(attempts[i].fd);
memmove(&attempts[i], &attempts[i + 1], memmove(&attempts[i], &attempts[i + 1],
(nb_attempts - i - 1) * sizeof(*attempts)); (nb_attempts - i - 1) * sizeof(*attempts));
@ -528,9 +524,8 @@ int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address,
if (last_err >= 0) if (last_err >= 0)
last_err = AVERROR(ECONNREFUSED); last_err = AVERROR(ECONNREFUSED);
if (last_err != AVERROR_EXIT) { if (last_err != AVERROR_EXIT) {
av_strerror(last_err, errbuf, sizeof(errbuf));
av_log(h, AV_LOG_ERROR, "Connection to %s failed: %s\n", av_log(h, AV_LOG_ERROR, "Connection to %s failed: %s\n",
h->filename, errbuf); h->filename, av_err2str(last_err));
} }
return last_err; return last_err;
} }
@ -591,7 +586,5 @@ int ff_http_match_no_proxy(const char *no_proxy, const char *hostname)
void ff_log_net_error(void *ctx, int level, const char* prefix) void ff_log_net_error(void *ctx, int level, const char* prefix)
{ {
char errbuf[100]; av_log(ctx, level, "%s: %s\n", prefix, av_err2str(ff_neterrno()));
av_strerror(ff_neterrno(), errbuf, sizeof(errbuf));
av_log(ctx, level, "%s: %s\n", prefix, errbuf);
} }