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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E872EC11F66 for ; Wed, 14 Jul 2021 00:15:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCEC761370 for ; Wed, 14 Jul 2021 00:15:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237147AbhGNASl (ORCPT ); Tue, 13 Jul 2021 20:18:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236981AbhGNASl (ORCPT ); Tue, 13 Jul 2021 20:18:41 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE298C0613E9 for ; Tue, 13 Jul 2021 17:15:49 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id u1so929675wrs.1 for ; Tue, 13 Jul 2021 17:15:49 -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 :mime-version:content-transfer-encoding; bh=dslKaYUbJj628knJ/DIHRtHZ6OoT95Cd25nYVQb7lN4=; b=R6bLNSIdNHT+DuxqwxdSGQXsiIWEGArEPd73uZN9e/Dh0jHeOT09TtuUdVDLZxmrzk r+lAoi8pzacSXze9ofZBsyKiP14/Pl6ly1v0KdPmvVyOtw5aTIvIuw7HOgdi4HWzKnzJ c4KRF6ZhbJleNIfOaw97+f5VwVuXAbajtStmhTF7f5BNwszi00KOon9XBJm2qp974PAw o+dA1y5XTVVcOe/J1PFNr9AOCLa79xUT2+zFSwURtwWT2T3N+ikE2to7cMsrrlweQGrU 24g+thbMqZ7d5zpRRnGNG+FR4LCHa9rydZF23aK+SOH+EUyJWvUoAWW8I4RLcB2T76WK w8/A== 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:mime-version:content-transfer-encoding; bh=dslKaYUbJj628knJ/DIHRtHZ6OoT95Cd25nYVQb7lN4=; b=PtvQKuazlEw9x9Qy3eNb8jAb6AC7umq313oar9ONFWfaUp8eHVYlRWk0CLp+7la2nV g/DcEhaws4Iv1VbMeMf7+Xvk2nfEyNvTyQhQA8Qdr8LVz3E6Hu8sPymF3acbyBmFqmwL FwrLHZNblCaP1ybcJuRcLwlK9TbaCX3nTisVw3zb/wwb6li6brFivN4gQ6ESua0/orBK FYU4x1D06n3pvISRr7BeeZqoq/jKwARE9ieu+YyUBFv0wEqXdhGd2jp6pdl6Md/e3qz3 QyWi5PNBIg4ihKzRtOuuiXXb2rl8/AWOVM7+hTKu28eUJkvPDUn8HzOB3RaTV9DY7iPu DQIg== X-Gm-Message-State: AOAM532kwjdIx9+0Wt4BdfJW6tx+Il1GLXNwC51JWdLJ1VyEo2hHKpiR OYFtDkN/xmDtNmzEgudYP3gXUpDLTNaN3jt0 X-Google-Smtp-Source: ABdhPJzeD7G9BEo4Rc0g7dcHaB/BDk8zWCgMmLMhJz8ICeih3P1OJgoWkR5wJR2ePI1YLJp7SPiC8w== X-Received: by 2002:adf:f74f:: with SMTP id z15mr9140984wrp.54.1626221748229; Tue, 13 Jul 2021 17:15:48 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id y197sm2876518wmc.7.2021.07.13.17.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jul 2021 17:15:47 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v3 1/5] *.c static functions: don't forward-declare __attribute__ Date: Wed, 14 Jul 2021 02:15:40 +0200 Message-Id: X-Mailer: git-send-email 2.32.0-dev In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 9cf6d3357aa (Add git-index-pack utility, 2005-10-12) and 466dbc42f58 (receive-pack: Send internal errors over side-band #2, 2010-02-10) we added these static functions and forward-declared their __attribute__((printf)). I think this may have been to work around some compiler limitation at the time, but in any case we have a lot of code that uses the briefer way of declaring these that I'm using here, so if we had any such issues with compilers we'd have seen them already. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/index-pack.c | 4 +--- builtin/receive-pack.c | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 3fbc5d7077..8336466865 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -369,9 +369,7 @@ static void parse_pack_header(void) use(sizeof(struct pack_header)); } -static NORETURN void bad_object(off_t offset, const char *format, - ...) __attribute__((format (printf, 2, 3))); - +__attribute__((format (printf, 2, 3))) static NORETURN void bad_object(off_t offset, const char *format, ...) { va_list params; diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index a34742513a..2d1f97e1ca 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -425,9 +425,6 @@ static int proc_receive_ref_matches(struct command *cmd) return 0; } -static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2))); -static void rp_warning(const char *err, ...) __attribute__((format (printf, 1, 2))); - static void report_message(const char *prefix, const char *err, va_list params) { int sz; @@ -445,6 +442,7 @@ static void report_message(const char *prefix, const char *err, va_list params) xwrite(2, msg, sz); } +__attribute__((format (printf, 1, 2))) static void rp_warning(const char *err, ...) { va_list params; @@ -453,6 +451,7 @@ static void rp_warning(const char *err, ...) va_end(params); } +__attribute__((format (printf, 1, 2))) static void rp_error(const char *err, ...) { va_list params; -- 2.32.0-dev