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 84B31461C7 for ; Thu, 8 Jun 2023 14:27:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 459BE68C2DF; Thu, 8 Jun 2023 17:26:51 +0300 (EEST) Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D92268C2F9 for ; Thu, 8 Jun 2023 17:26:43 +0300 (EEST) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-1a2dd615ddcso69408fac.0 for ; Thu, 08 Jun 2023 07:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686234401; x=1688826401; 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=aKjjomk+rFdZumIhKTMn58gtiv3m+nosMe55iQbYEiw=; b=WiPzql+DytYPNy5hyp4TyZZysHd6JGgz9JBHjX8/Ycn3SI9w1MmB8qiFCCDdvIAfks 1l9swQNoTC+Cb+KyQckleaJOCcXkVRFJeISaVKDXnA9prJRxbx3cx9y9ffJBoUAuB1Yg +lsLauSCMBu0uyVqTbyRMSbF85XVFag1C6qntu+Ve8YmhbjgZi4l6BG32IYoui5R5A4U yMuiAz+aykIJsNzsrQveKtsHSqCP7z1V56yfFJ4bZIYJjuioFXAWQ+kLGjxDMMx1UArf WLUThN+LIIH1GDDyh7Owz9g3m+FtNA7z/vbjJgGIxUVzyo0CpVk+2YMQThdGthFfqC2w rylQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686234401; x=1688826401; 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=aKjjomk+rFdZumIhKTMn58gtiv3m+nosMe55iQbYEiw=; b=QaHH8I2Rnuh0FcrsZZKnyyHkECsACfUuHvVq8NZyQ10igBOyexJGxFuGOv3TWIuNnW 2svRJW0jOc9lQJQVNL7DxKIOgpKKno+JskpgtueDQuov3petnheAy4N6wSSvHG/8uQ/H G5v6jj72UoBBPtTdvQ92OSZX2zzpWt+RVAA6W4IlGSizPQCMTb2e/2JZ7x6TJFB0OWQC lPYbyT3tnTLMmzUoU5Mw/qD4z6veGOgZ9gTUW1bd7C1wSIIzGw5wis1fJeIAbuY4HzfU clJ5NKnUi5sw/du4uC9iekyf8YkeE/mE0+TBfpEhKh0XnUaA9j637O46r3S/pK9k+D9q NSzA== X-Gm-Message-State: AC+VfDwtfbIaRJOAs9/4yePDBb0hUFAhVWx87X/+uvFsxipwT0xhD10S tYvWKe4wPQpkrdrK7zJgUgCACbdBcNo= X-Google-Smtp-Source: ACHHUZ6QyETyFAOq99+oOiMkzsRjb4H+j702Ft3+xdiq/e6/Y5w3yn9704KyH/+VTqfyf0JZ+LrYNA== X-Received: by 2002:a05:6870:1694:b0:192:aa8c:e385 with SMTP id j20-20020a056870169400b00192aa8ce385mr3966804oae.5.1686234401611; Thu, 08 Jun 2023 07:26:41 -0700 (PDT) Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id b206-20020a0dd9d7000000b0056943d9cf8fsm414589ywe.9.2023.06.08.07.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 07:26:41 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Jun 2023 10:26:36 -0400 Message-Id: <20230608142637.45033-5-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608142637.45033-1-leo.izen@gmail.com> References: <20230608142637.45033-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/jpegxl_probe: inline various ret < 0 checks 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: Leo Izen 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: Inlines some ret < 0 checks to look like: if ((ret = func()) < 0) return ret; which clarifies code slightly. Signed-off-by: Leo Izen --- libavformat/jpegxl_probe.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/jpegxl_probe.c b/libavformat/jpegxl_probe.c index 88492cb772..b4ab45518a 100644 --- a/libavformat/jpegxl_probe.c +++ b/libavformat/jpegxl_probe.c @@ -254,8 +254,7 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid uint64_t extensions; int ret; - ret = init_get_bits8(gb, buf, buflen); - if (ret < 0) + if ((ret = init_get_bits8(gb, buf, buflen)) < 0) return ret; if (get_bits_long(gb, 16) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE) @@ -281,8 +280,7 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid /* preview header */ if (get_bits1(gb)) { - ret = jpegxl_read_preview_header(gb); - if (ret < 0) + if ((ret = jpegxl_read_preview_header(gb)) < 0) return ret; } @@ -309,8 +307,7 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid if (num_extra_channels > 4 && validate_level) return -1; for (uint32_t i = 0; i < num_extra_channels; i++) { - ret = jpegxl_read_extra_channel_info(gb, validate_level); - if (ret < 0) + if ((ret = jpegxl_read_extra_channel_info(gb, validate_level)) < 0) return ret; if (get_bits_left(gb) < 1) return AVERROR_INVALIDDATA; -- 2.40.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".