From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB118C433F5 for ; Sat, 25 Sep 2021 13:05:02 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2ECF1610D1 for ; Sat, 25 Sep 2021 13:05:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2ECF1610D1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DECE8354C; Sat, 25 Sep 2021 15:04:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="gxrqPOhI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BCC0B83557; Sat, 25 Sep 2021 15:03:59 +0200 (CEST) Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D37C48351C for ; Sat, 25 Sep 2021 15:03:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x336.google.com with SMTP id x33-20020a9d37a4000000b0054733a85462so17101176otb.10 for ; Sat, 25 Sep 2021 06:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WH0h8Jg9oWdKN8gH89G+9sBAL/fpmNjJxmIopIRCRqE=; b=gxrqPOhIQyK9nv2FpD44zTBqQC0KywDhwF86+KgprZtz7uFCAPCRlVMgOovYjtGmXJ aozYy0f8eDoVx0iFTwZe9XlN7QVORE03gN0cA6NehoBZf2RIvdXEYu4/TA4yxuWMCj6c eysKhKXnjBImaIIykHqi5xermsPkI8G4I34l0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WH0h8Jg9oWdKN8gH89G+9sBAL/fpmNjJxmIopIRCRqE=; b=yueqfI5ugFVa+CB8avaVwORaKzozoYzY8ipO1E2h7hmYe2k2M7zzGJG8sGhZ1cAjk2 adwNZYMxhHMMgdcqNGJssWxEz1wp7hmefZeN37cmjlr/rg27p2itRw27/njMXmRrXuPb H/oHbcYdAxkaSAHsUUwbnkKlIw0SovkKp4MdeuzENNOSKwwWu/gvpuT47wy/KT3gczzI Qdzjnwbmkmw3FnH+YfqMydjJDdUFIUm5rutDJgWRBNPTfl3mIV/sTU0vz3XWI7Hf7msG KHvsbcIzt6QWLv0uuJYZdpqh9WKbZlpHNlY/jyMXlnZ4s8haHDooULPkFKLv7nRY/N+f DXeQ== X-Gm-Message-State: AOAM531aNhJkaIKhe0DklMYPZ25uI4rCMUwafjyRDHDQ9GewwlV/YpU+ LbDRFuiGgFK5HIb7c/T6X5NjYrV03WW+CA== X-Google-Smtp-Source: ABdhPJzOxiy9C9oCIslLtRWIzy7wc4EeXUGkT924K0uFmigNYjkzAGyPUnVC8nwo3e4h96ISRxEdtA== X-Received: by 2002:a05:6830:1da6:: with SMTP id z6mr3158323oti.234.1632575024224; Sat, 25 Sep 2021 06:03:44 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id f61sm2770018otf.73.2021.09.25.06.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 06:03:43 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Alexandru Gagniuc , Bin Meng , Tom Rini , Simon Glass , Joe Hershberger , Marek Vasut Subject: [PATCH v4 06/15] image: Avoid switch default in image_decomp() Date: Sat, 25 Sep 2021 07:03:11 -0600 Message-Id: <20210925070255.v4.6.Ieb772c007c48b64bcd9e162f57191522edf964ba@changeid> X-Mailer: git-send-email 2.33.0.685.g46640cef36-goog In-Reply-To: <20210925130320.7824-1-sjg@chromium.org> References: <20210925130320.7824-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean At present this function is full of preprocessor macros. Adjust it to check for an unsupported algorithm after the switch(). This will allow us to drop the macros. Fix up the return-value path and an extra blank line while we are here. Signed-off-by: Simon Glass --- (no changes since v1) common/image.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/common/image.c b/common/image.c index e58793bd69f..d80781f2eb4 100644 --- a/common/image.c +++ b/common/image.c @@ -446,7 +446,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, void *load_buf, void *image_buf, ulong image_len, uint unc_len, ulong *load_end) { - int ret = 0; + int ret = -ENOSYS; *load_end = load; print_decomp_msg(comp, type, load == image_start); @@ -458,6 +458,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, */ switch (comp) { case IH_COMP_NONE: + ret = 0; if (load == image_start) break; if (image_len <= unc_len) @@ -539,22 +540,23 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, } image_len = ret; - break; } #endif /* CONFIG_ZSTD */ #endif - default: + } + if (ret == -ENOSYS) { printf("Unimplemented compression type %d\n", comp); - return -ENOSYS; + return ret; } + if (ret) + return ret; *load_end = load + image_len; - return ret; + return 0; } - #ifndef USE_HOSTCC #if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT) /** -- 2.33.0.685.g46640cef36-goog