From patchwork Wed Jun 24 23:32:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20597 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F26DA4491EA for ; Thu, 25 Jun 2020 02:33:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D66976808CC; Thu, 25 Jun 2020 02:33:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8776068097A for ; Thu, 25 Jun 2020 02:33:03 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id q90so1460866pjh.3 for ; Wed, 24 Jun 2020 16:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u4kBKuAi180fGZzpRYP58VmiJnD/KjV+KiaoQ8V9FxY=; b=UFJaeyRmO3YyBxZqsoVbAyxoevtL9RsDgVLH8MWeMNaQorcSjKQJDuU5b6RNNohEuh L1iUW+NpIBTix+Jngt3BSHgOIsWOgq5QUUxq2HASdgwKI6dDkpj/0pQ0ipKv1UGLkbML CkMOSoaie4pYOYktWrv25eSzenZBkATjaaebGTbRFzFV7njfcWk7iL0mdfqQLzQrD6ro 9p14mgNHXdNEn8y4T99+LPKK2VosJJ5oBJLPNADtvItIYku2BqdbdGxV8YNy6XHucPDy EVf18BmluhG4Yi7bLMmUkSqEwfhTD+OjqmdmdQnRvnMH3r2ih1FW7ictd9YLvMR2V/Ef sjrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u4kBKuAi180fGZzpRYP58VmiJnD/KjV+KiaoQ8V9FxY=; b=i9t38JNT9QNhGNaJWxVWD8tgL6V98IYqNZxSgZ3XloH6uySH57pSHObaC0OAOjd4zC NZrBye+Nnuzu1MOzmY0O099xfMuteSkFWfb3fpS44FRjGUZoDqwl0/yQ84omnF2Uf+Ql MKAkFtpcIp4h7NmCedJHX1DFjQSD4hQ3ByK2KmtsL0jfduqFstqfeCDxO1red1d8c3ti 1xpLYnFnsoEzspOgiLtNl0uL0L9NBZkqbOx/FkVnAU+2OX7ouicF5b7z3MiFprHkVPeU XsP0FkO4N6RA6TlPdLNEINdP7doxXTmyV+7+T5/Cmw833j69ijGgQN4y+QIUsmo2NwEg 37vA== X-Gm-Message-State: AOAM531/aZ1P3Htmir2ib2AsbR1vvZt5eDvW3K7sD1YbHijq37NogJll DWqR3Tcl0AbiHtgzfX4YAriVXwpi X-Google-Smtp-Source: ABdhPJz28EJ05QYISj79stxBKcAqpoKd3ch6NIMO7M3kOGzCJJ4AHwk6pHs7M/kLUL8zNm0HOziQwg== X-Received: by 2002:a17:90a:d596:: with SMTP id v22mr229376pju.180.1593041581390; Wed, 24 Jun 2020 16:33:01 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.33.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:33:00 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:37 +0800 Message-Id: <1593041559-27350-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 4/6] avformat/hlsenc: use proper error codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 71fa3db..f7a4f30 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -370,6 +370,7 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla int addchar_count; int found_count = 0; AVBPrint buf; + int ret; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); @@ -395,10 +396,10 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla } if (!av_bprint_is_complete(&buf)) { av_bprint_finalize(&buf, NULL); - return -1; + return AVERROR(ENOMEM); } - if (av_bprint_finalize(&buf, &new_filename) < 0 || !new_filename) - return -1; + if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename) + return ret; *s = new_filename; return found_count; } @@ -411,6 +412,7 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla int nd, addchar_count; int found_count = 0; AVBPrint buf; + int ret; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); @@ -444,10 +446,10 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla } if (!av_bprint_is_complete(&buf)) { av_bprint_finalize(&buf, NULL); - return -1; + return AVERROR(ENOMEM); } - if (av_bprint_finalize(&buf, &new_filename) < 0 || !new_filename) - return -1; + if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename) + return ret; *s = new_filename; return found_count; }