From patchwork Mon Jun 22 15:24:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20558 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 0DC8244B609 for ; Mon, 22 Jun 2020 18:47:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1EB668B8BA; Mon, 22 Jun 2020 18:47:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E036F68B672 for ; Mon, 22 Jun 2020 18:47:15 +0300 (EEST) Received: by mail-oi1-f195.google.com with SMTP id p70so15983299oic.12 for ; Mon, 22 Jun 2020 08:47:15 -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=GqI4+yfPvEFnPquaBz9ytF7cEO7dWtUvbWa1P15Se39/3StCg0jRMxgOm/ElHVpHw7 h2zUhZ1ADkOUurYKHsZojVNK3+W2T69ZUjTrDk7WeIayp9tRR8g21RK+l+bMdlczzqui hn0r3gsknB/BYUe08znkmQpRj3zwu1j+CubepPl/lyPMU9p/dkkUHO+upTv6lZveqHm/ jcLLIPejsGc3oZ0yswYrHJIkzChBszMUnLF8rDWxYJHxfR+E4iTYzE+NlmKR/rHUX+xc wY7xMQtB7rRPQgwNoNx6OSDamWg5Ca0yyKzoaUqIohxWf+X/JLz/iel9o2issI3eqMBv kj0Q== 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=qLOY1XO0+kUHGQeUbnOqZnU9TOBu7vohiotlbbi8MbL4bJ2hQ4vMwwjyKslmEUxb31 8CjuiWoJ2l966ncPjTbr7IM1/x/nN7ARAejuuhoqu1ibeij9RQPTABYc3MQtJT+QCGG9 1eYgGvdbvbaa4AaLnOjy7NiNKcjbfK8jFRm92+V2nn595nAMyqHIrg0IAeqGc6hRLYLJ MzNddNbhnTIs7L0RaFDqpLWiBdHoc7GN/ry6YxygJTPrFLH3T/JxVnOEPwulIjWxlj9A 4kXyHPgb0LyvqZIT013l/vIpkwc9lS+VtgqnrpLpaDcYPi8gbAoR7YxYySdgQm+iXocZ a8Ng== X-Gm-Message-State: AOAM533giDat30DmGlk/g4OBTw6SLIYZXw6c0+o8LyHO/Vpg5wKUYZTG 7tksmmZAb0MiSz/ESwtC14FHX597 X-Google-Smtp-Source: ABdhPJxXFbTKlOaHTc3RT5qLbO2Aclm5YF8QmpUJBAY7WU3KPBqLf3GMyQY9r4HSfcWeZGs++qx9qw== X-Received: by 2002:a17:90a:d188:: with SMTP id fu8mr17689772pjb.149.1592839496856; Mon, 22 Jun 2020 08:24:56 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:56 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:33 +0800 Message-Id: <1592839474-2804-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/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; }