From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id D5D9B4D2FF for ; Mon, 30 Jun 2025 15:02:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3D39B68E314; Mon, 30 Jun 2025 18:01:47 +0300 (EEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 0216868E320 for ; Mon, 30 Jun 2025 18:01:40 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id d2e1a72fcca58-747e41d5469so2459758b3a.3 for ; Mon, 30 Jun 2025 08:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751295699; x=1751900499; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TEz8lMb7/4PggTrgp1Ih2VbYdsWw8fSWGwTaEi2nYn0=; b=jmdg84p1wzQlFjnPDVMcPKK63Uir6L+PjQqjN9MppKGG09ORfaC4M7tBTMOSg/Y1qW LjWB517ZNNLHASqmBp2udbvfpAjv2z3NFkSh4niubEv0dmDlDXtMDkBc/BdlpTCz9Vu6 mff8vK0//BFz7iNFwlGSAGGjILScom0yxqtt0DTC15ieXd+W5cm78S1E8Wm0jcZ7W8m8 VQm1173jVbhW3MORTJLQuq5/Sna9bcu0iCngYCjmT8Gp7ue6sbKRjwwUIp/wcT2pmzui /rasAKAiL5J4HW0pKcjYgxD3GKOU9sqUueiSiiO+8Qsm8seeyt6/AdPvgPB67l2dk/wN AO9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751295699; x=1751900499; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TEz8lMb7/4PggTrgp1Ih2VbYdsWw8fSWGwTaEi2nYn0=; b=f3tNLucMSlCTfMtVSkDDb2hE9E1plkmO9Hx/C5kaT3SFTFEJBxzvh4KcaUfbCKlZHV 1VcIUD7UpIkexfmAPIk9nbRF7NCgyHBuxslZAONmlm4uLTm1NSJ2oJrfcUMIMlfWqmtU lD6Om5KV7hNIsP33u9mhJqyVnFYFFPExRu3AuC+cDuqW6Sqqme2XwjTpRE6xCfjr/5o7 5NnEEQtizz7e8lPGnxHrsUOrFh5oqD733ueAFvmdx1OA5oglKFfHP3RqvQRmT5+qMUjf OkSiUBi4Yxpb/PzG2ArqB8jcAco4rFOuRXJYRKAOLEnm0VGNIWc06AIMXkOeS5ArRcFK VuDA== X-Gm-Message-State: AOJu0YyeQR2ZdsML9BlC2bcWd0EYsR3WglHbAhO5mB9vQc5C5v3soO3O 4rUjg/HG4bV4wKkYoUNGTquO+XUtLO8lcKUZLHu5qJ4ZyZKS9LGjLvKfCEmQc8zphSTWYw== X-Gm-Gg: ASbGncvFJX1ggi7948uLoYCq/wkKChWYQCEASc+rsMe7FYQb77zHKI48hgZ9yM6h1gj 5XaswzY45EwXRVAp26GhaGAxdreDZnEN3mJnlLL7JVP1E6N7rwP+KkdSxRDBr9MdQcOzau2LaWv nd1jlKnR8Op1XWxqTdqR+EPSNDRTEybQRxyE1ONVlHnb9gBsmAtCs8O6LrEPWpAVpI8oL/dcZ/J 1THn+nrqdjhWPRXN7E0nLB2h3pvnOF0iX1YaHmGaNqgXadIfkQwpUSL5DUQPrD20UmA4qREPGqc wBqFqKDsssedF1Bg5276mcm4C3dd6VSGYPNkE9iOj6SEekzGKj3az9rlF1fECIUlwvui X-Google-Smtp-Source: AGHT+IEcSP9/gM5Un34TnUewVH2bc8NIJqtSiqKXascHv437gcUYcYzRcp8y+rUvsWMAoSveorJ4Ow== X-Received: by 2002:a05:6a20:2d0b:b0:215:dee4:4808 with SMTP id adf61e73a8af0-220a1292cb0mr23057681637.18.1751295698581; Mon, 30 Jun 2025 08:01:38 -0700 (PDT) Received: from r760 ([188.253.126.215]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af541bd0fsm8963434b3a.40.2025.06.30.08.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 08:01:38 -0700 (PDT) From: Lidong Yan X-Google-Original-From: Lidong Yan <502024330056@smail.nju.edu.cn> To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Jun 2025 23:01:14 +0800 Message-ID: <20250630150114.2152464-4-502024330056@smail.nju.edu.cn> X-Mailer: git-send-email 2.50.0.106.gf0135a9047.dirty In-Reply-To: <20250630150114.2152464-1-502024330056@smail.nju.edu.cn> References: <20250630150114.2152464-1-502024330056@smail.nju.edu.cn> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/3] avformat/sapenc: reword fail to cleanup in sap_write_header() 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 Cc: Lidong Yan <502024330056@smail.nju.edu.cn> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: In sap_write_header(), normal execution would fall through to fail labeled code, thus cleanup would be a better name compared to fail. Replace the use of fail label with cleanup label. Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn> --- libavformat/sapenc.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 0882690ba5..63436b9667 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -113,7 +113,7 @@ static int sap_write_header(AVFormatContext *s) if (getaddrinfo(host, NULL, &hints, &ai)) { av_log(s, AV_LOG_ERROR, "Unable to resolve %s\n", host); ret = AVERROR(EIO); - goto fail; + goto cleanup; } if (ai->ai_family == AF_INET) { /* Also known as sap.mcast.net */ @@ -130,7 +130,7 @@ static int sap_write_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Host %s resolved to unsupported " "address family\n", host); ret = AVERROR(EIO); - goto fail; + goto cleanup; } freeaddrinfo(ai); } @@ -138,7 +138,7 @@ static int sap_write_header(AVFormatContext *s) contexts = av_calloc(s->nb_streams, sizeof(*contexts)); if (!contexts) { ret = AVERROR(ENOMEM); - goto fail; + goto cleanup; } if (s->start_time_realtime == 0 || s->start_time_realtime == AV_NOPTS_VALUE) @@ -156,17 +156,17 @@ static int sap_write_header(AVFormatContext *s) s->protocol_whitelist, s->protocol_blacklist, NULL); if (ret) { ret = AVERROR(EIO); - goto fail; + goto cleanup; } ret = ff_rtp_chain_mux_open(&contexts[i], s, s->streams[i], fd, 0, i); if (ret < 0) - goto fail; + goto cleanup; s->streams[i]->priv_data = contexts[i]; s->streams[i]->time_base = contexts[i]->streams[0]->time_base; new_url = av_strdup(url); if (!new_url) { ret = AVERROR(ENOMEM); - goto fail; + goto cleanup; } ff_format_set_url(contexts[i], new_url); } @@ -181,13 +181,13 @@ static int sap_write_header(AVFormatContext *s) s->protocol_whitelist, s->protocol_blacklist, NULL); if (ret) { ret = AVERROR(EIO); - goto fail; + goto cleanup; } udp_fd = ffurl_get_file_handle(sap->ann_fd); if (getsockname(udp_fd, (struct sockaddr*) &localaddr, &addrlen)) { ret = AVERROR(EIO); - goto fail; + goto cleanup; } if (localaddr.ss_family != AF_INET #if HAVE_STRUCT_SOCKADDR_IN6 @@ -196,13 +196,13 @@ static int sap_write_header(AVFormatContext *s) ) { av_log(s, AV_LOG_ERROR, "Unsupported protocol family\n"); ret = AVERROR(EIO); - goto fail; + goto cleanup; } sap->ann_size = 8192; sap->ann = av_mallocz(sap->ann_size); if (!sap->ann) { ret = AVERROR(EIO); - goto fail; + goto cleanup; } sap->ann[pos] = (1 << 5); #if HAVE_STRUCT_SOCKADDR_IN6 @@ -231,7 +231,7 @@ static int sap_write_header(AVFormatContext *s) if (av_sdp_create(contexts, s->nb_streams, &sap->ann[pos], sap->ann_size - pos)) { ret = AVERROR_INVALIDDATA; - goto fail; + goto cleanup; } av_freep(&contexts); av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", &sap->ann[pos]); @@ -241,12 +241,12 @@ static int sap_write_header(AVFormatContext *s) if (sap->ann_size > sap->ann_fd->max_packet_size) { av_log(s, AV_LOG_ERROR, "Announcement too large to send in one " "packet\n"); - goto fail; + goto cleanup; } ret = 0; -fail: +cleanup: for (i = 0; i < s->nb_streams; i++) if (contexts[i]) av_free(contexts[i]->url); -- 2.50.0.106.gf0135a9047.dirty _______________________________________________ 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".