From patchwork Mon Mar 20 13:42:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 665195 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp1130539wrv; Mon, 20 Mar 2023 06:43:24 -0700 (PDT) X-Google-Smtp-Source: AK7set+fjoGJhVN6sikkX0VXCJGx4ilyM1lfr08r44wnzgOo8y5W/nfHecGfz9a+30mlaDNR4i18 X-Received: by 2002:a05:6214:19ce:b0:5a5:b269:bfd7 with SMTP id j14-20020a05621419ce00b005a5b269bfd7mr42664410qvc.8.1679319804494; Mon, 20 Mar 2023 06:43:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679319804; cv=none; d=google.com; s=arc-20160816; b=hHoyfKQiZiRl6rJFdaz/Yv6/7ULT/W1T1abMHByK+hbh0iJMz1kn3/u0p/sLjvjeWB KXdZeVxw2t6lYk/qMrUjy/83jwTAJFZoix3j+APUc9x29MOSk1rcF1zbsQ4NJIIreeoE 8GEtN4x7VT7dS04tIsQlEP4IqQIyWyQRXwAAPjccSJWfxbqeYDk0P7PoKp8naiO9zk1+ 7vD68vZbJJQfbF88gGdkMeLBdsgjPPDg4Wt89pS8BwCKBQJZS49E0Sm3QXSWRUsm3ZSc PK1kegdNbSWBZN2KKua4ftO8iqU0IPBwQOjDOjMr3BY7oJLWw6Ix0uigE19WlDR2HSEg ZV0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0NISlk1vZdvB+f1eUp7+3HHuzYbWQKCVdKec7G0ejZQ=; b=MmVRT4jX/9HmINw2aOfj8VRq2SefRWbH7S1GYOOffNx21AhFYKA3DprU30Kc9JQSSY kyrIF+ESF0NoKK7slW8kDMUdSEkTCxb+V/akX6BSOebYYJOjkhLCCh5Oa+NQz1jg7QiM vKG4mDzZ1ObZWqHlBIwZ7x8OKf2bw9EXW90ec75LGGToLm9Jc+m707PTdL2s0jQiozCC +c3bP2t1MWY3DSOCLi8bdFfst5trctHd5cKf+Huz5Mx/829NaHieCMArkM2qVJlMWIf8 gvH1jtkPRHEYSF8mQueeqlN+nWpKx8MG8aVFw5UJMRnABv7WFc4Tel/ZKeX4Ujv7PY8M 6NFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HRSBo9QO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k17-20020ad44511000000b0056eb136aa91si5693038qvu.63.2023.03.20.06.43.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Mar 2023 06:43:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HRSBo9QO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peFmV-0006Y1-Bn; Mon, 20 Mar 2023 09:42:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peFmT-0006X8-Jn for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peFmS-0001or-2Z for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:33 -0400 Received: by mail-wm1-x32e.google.com with SMTP id i5-20020a05600c354500b003edd24054e0so2436812wmq.4 for ; Mon, 20 Mar 2023 06:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679319751; 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=0NISlk1vZdvB+f1eUp7+3HHuzYbWQKCVdKec7G0ejZQ=; b=HRSBo9QOdLq686/8kQUjmjY3yN+yirMNHdIDFhMOOaglRj+pXTD+KEMl/b71YzK80c JQiKGo4gTeWL6m3/jSY0RJja6/wSkewfTq3Rid8LkVKGu+4xvu7pqSWjghPCmUIq8BEu TDIc1Oj0zuvcXfL5Ve6NAXpaUOcY8fq9LMOf191sS3sI+0gSfGcI11aoimRqXCkRvTFx jn5pJcgrfsUqDkwKvjvLgna1kYv2lMczCLxLsvdC9FEDEA9cB8j4cXBcVZdPIi8yHLgf +gCz8mRtb2Jf7HzuT4UEZJWj3RYyNt36luyhGLDw9LXTd3UE17i3IzQtdLVZCvkd0/9G 4qOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679319751; 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=0NISlk1vZdvB+f1eUp7+3HHuzYbWQKCVdKec7G0ejZQ=; b=J7n342iLBZ5D2ZToNoIvNANKAqaTxP5Vl/lQ7gu+vl0Ea4DhrNRVthMf4f6VJHToZ1 UVUGLnGDY6jJjkeQtBD3Lm+46MNwwLg7F21kVq6NSNNUgK5Evy2FI3KGl56wqaTdcX8C vKlUsNHMjZLebjv2y0w5pYzbpV7E2Ic1UTlzg6usAkwhJO6g4BjzEVVQnyFxdQa3CMsR 7RcFi+9sP8KkHl1tdXEJrVFaiU707H8xltA0EwryfIKdgzIb3m2RSae92D5/mUZU6zg6 3z6qSCbC4Xo99eezDzBRw2iJFmupN3396bqYRvKvoKNiPaq01ZLzZYaA3asMz5DhzubB zeVA== X-Gm-Message-State: AO0yUKUhYedcOvopIPfRp5fOtjpEKzBYHeCmdxeeC01IoPDv+fj7/E7T XA7247WR07AdjQpStoAUjx6tfTgT6xImXlINOZ6dPw== X-Received: by 2002:a05:600c:511c:b0:3ed:2b49:eefc with SMTP id o28-20020a05600c511c00b003ed2b49eefcmr21077191wms.3.1679319751155; Mon, 20 Mar 2023 06:42:31 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id a4-20020adffb84000000b002d322b9a7f5sm8942325wrr.88.2023.03.20.06.42.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Mar 2023 06:42:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Stefan Hajnoczi , Kevin Wolf , Hanna Reitz Subject: [PATCH-for-8.1 2/5] block/dmg: Remove duplicated prototype declarations Date: Mon, 20 Mar 2023 14:42:16 +0100 Message-Id: <20230320134219.22489-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230320134219.22489-1-philmd@linaro.org> References: <20230320134219.22489-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Both dmg_uncompress_bz2 / dmg_uncompress_lzfse are declared in "dmg.h", included 1 line before. Signed-off-by: Philippe Mathieu-Daudé --- block/dmg.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/block/dmg.c b/block/dmg.c index e10b9a2ba5..a5d22fb8f9 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -31,12 +31,6 @@ #include "qemu/memalign.h" #include "dmg.h" -int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in, - char *next_out, unsigned int avail_out); - -int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in, - char *next_out, unsigned int avail_out); - enum { /* Limit chunk sizes to prevent unreasonable amounts of memory being used * or truncating when converting to 32-bit types