From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D0C4F47564 for ; Mon, 11 Sep 2023 18:48:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D75C68C970; Mon, 11 Sep 2023 21:48:23 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48FEF68C7D4 for ; Mon, 11 Sep 2023 21:48:17 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id A374BE90A3 for ; Mon, 11 Sep 2023 20:43:51 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qyrkPqDqc0nZ for ; Mon, 11 Sep 2023 20:43:48 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 01130E7F9B for ; Mon, 11 Sep 2023 20:43:47 +0200 (CEST) Date: Mon, 11 Sep 2023 20:43:47 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: Message-ID: <8abac7a8-ebad-3d44-7580-30331767435a@passwd.hu> References: MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v3] avformat/avio: Don't use incompatible function pointer type for call X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Mon, 11 Sep 2023, Andreas Rheinhardt wrote: > It is undefined behaviour even in cases where it works > (it works because it is only a const uint8_t* vs. uint8_t* difference). > > Instead add a cbuf parameter to pass a const buffer (for writing) > as well as a parameter indicating whether we are reading or writing; > retry_transfer_wrapper() itself then uses the correct function > based upon this information. > > Signed-off-by: Andreas Rheinhardt > --- > Another approach; IMO the best of the three. What do you think? OK for me, thanks. Marton > > libavformat/avio.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/libavformat/avio.c b/libavformat/avio.c > index b6a192892a..b793a7546c 100644 > --- a/libavformat/avio.c > +++ b/libavformat/avio.c > @@ -348,10 +348,9 @@ fail: > } > > static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, > + const uint8_t *cbuf, > int size, int size_min, > - int (*transfer_func)(URLContext *h, > - uint8_t *buf, > - int size)) > + int read) > { > int ret, len; > int fast_retries = 5; > @@ -361,7 +360,8 @@ static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, > while (len < size_min) { > if (ff_check_interrupt(&h->interrupt_callback)) > return AVERROR_EXIT; > - ret = transfer_func(h, buf + len, size - len); > + ret = read ? h->prot->url_read (h, buf + len, size - len): > + h->prot->url_write(h, cbuf + len, size - len); > if (ret == AVERROR(EINTR)) > continue; > if (h->flags & AVIO_FLAG_NONBLOCK) > @@ -398,14 +398,14 @@ int ffurl_read2(void *urlcontext, uint8_t *buf, int size) > > if (!(h->flags & AVIO_FLAG_READ)) > return AVERROR(EIO); > - return retry_transfer_wrapper(h, buf, size, 1, h->prot->url_read); > + return retry_transfer_wrapper(h, buf, NULL, size, 1, 1); > } > > int ffurl_read_complete(URLContext *h, unsigned char *buf, int size) > { > if (!(h->flags & AVIO_FLAG_READ)) > return AVERROR(EIO); > - return retry_transfer_wrapper(h, buf, size, size, h->prot->url_read); > + return retry_transfer_wrapper(h, buf, NULL, size, size, 1); > } > > #if FF_API_AVIO_WRITE_NONCONST > @@ -422,9 +422,7 @@ int ffurl_write2(void *urlcontext, const uint8_t *buf, int size) > if (h->max_packet_size && size > h->max_packet_size) > return AVERROR(EIO); > > - return retry_transfer_wrapper(h, (unsigned char *)buf, size, size, > - (int (*)(struct URLContext *, uint8_t *, int)) > - h->prot->url_write); > + return retry_transfer_wrapper(h, NULL, buf, size, size, 0); > } > > int64_t ffurl_seek2(void *urlcontext, int64_t pos, int whence) > -- > 2.34.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".