From patchwork Thu Oct 6 19:43:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Hostetler X-Patchwork-Id: 13000701 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3731AC433F5 for ; Thu, 6 Oct 2022 19:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232039AbiJFTn1 (ORCPT ); Thu, 6 Oct 2022 15:43:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232053AbiJFTnV (ORCPT ); Thu, 6 Oct 2022 15:43:21 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 889F1E319D for ; Thu, 6 Oct 2022 12:43:19 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id r132-20020a1c448a000000b003bd44dc526fso10622wma.3 for ; Thu, 06 Oct 2022 12:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=VPgyp4ckHqvvaJ6baaVJ8Jv77VXRgfst9Y/kaPB2P8s=; b=qpv5N+ONCXFCfRAgI2xbIcRloavUZH6qQS1ySgus6IzDzEtshfcF4oSLUbVaUk+8qI E0sKFsiEcUbXDaJq9DF/VZL465+U1tW1oYh19mp+8m1jKCxeYznUUGbOEHlXAnx/uqRr Z5KFdKoPSp7ZJZaD9TThgMjsYY7XItSQ1D7XtnFETfPH/PUjgTW2eSBV8ErJriiTq0wN QbOsA4s/4RNXQLz763xaaxcf3r9KBmQ644QDXfeyCup3mSMw6cVYcTl7r6w0YRzN1zRK Q/Oj1qwhA7FPkUuh8beddYzKDsUJ4IEVFh22u41wGfDZyDShqqAPxivfkN75qDBiQ46I Rpfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VPgyp4ckHqvvaJ6baaVJ8Jv77VXRgfst9Y/kaPB2P8s=; b=45RdQPOmUUGEz86iE3xvGmyI6PeY72gyxo7QGefI2Ba86bxCy+KM5O2i2JsGMs+9D5 +5MoWk7A/4RA192S1YPTAkyfcVu44d8vWBhsn05qhDp+I9I95MEkgTr4q03aNGix26oE ra9V8trWmtwcQNFIy8dcNFAnBYiRmYEWE6hNGNNX+0g+KN5wFVnEDM1PEsw9fOatklEI +pMfFJgH8W9tjwWWPtTih/6tpF1AwRveM2GYUXU7ktzBgiXj7pbVk0SQ0LCX8pMe6J1q oZrmfVJzIHJL6eOryY/m8cET+AzOaMpg7n8ttB4yPW0EsyQdjSKgwbapscc4nku72BDw JL1g== X-Gm-Message-State: ACrzQf3q42rNy0lsOPcPcW6u+fxvKXZZMWAhd9imOO5aC8cFBo8pLqTM aQ5mFXh3XvUrUtvktfvRRgzvpove70w= X-Google-Smtp-Source: AMsMyM4fJgD1EbPPuPqXnCyqw0OuyfP6JKJLpVwrFUED1kOwNlFsb/Sgq0WK4KwHBuoadfGxCrIOLg== X-Received: by 2002:a05:600c:4ec8:b0:3b4:bdc6:9b3d with SMTP id g8-20020a05600c4ec800b003b4bdc69b3dmr7955894wmq.181.1665085397801; Thu, 06 Oct 2022 12:43:17 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h7-20020a05600c350700b003b4868eb71bsm6263587wmq.25.2022.10.06.12.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 12:43:17 -0700 (PDT) Message-Id: <7cee38788a7a3c2c09a238e01c5bd825445f999d.1665085395.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 06 Oct 2022 19:43:14 +0000 Subject: [PATCH 1/2] builtin/merge-file: fix compiler error on MacOS with clang 11.0.0 Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jeff Hostetler , Jeff Hostetler Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jeff Hostetler From: Jeff Hostetler Add extra set of braces around zero initialization of two array/structure variables to resolve compiler errors/warnings from clang 11.0.0 on MacOS. This is not needed on clang 14.0. $ uname -a Darwin jeffhost-mbp.local 19.6.0 Darwin Kernel Version 19.6.0: \ Mon Apr 18 21:50:40 PDT 2022; \ root:xnu-6153.141.62~1/RELEASE_X86_64 x86_64 $ clang -v Apple clang version 11.0.0 (clang-1100.0.33.17) Target: x86_64-apple-darwin19.6.0 [...] $ make builtin/merge-file.o CC builtin/merge-file.o builtin/merge-file.c:29:23: error: suggest braces around initialization \ of subobject [-Werror,-Wmissing-braces] mmfile_t mmfs[3] = { 0 }; ^ {} builtin/merge-file.c:31:20: error: suggest braces around initialization \ of subobject [-Werror,-Wmissing-braces] xmparam_t xmp = { 0 }; ^ {} 2 errors generated. make: *** [builtin/merge-file.o] Error 1 Signed-off-by: Jeff Hostetler --- builtin/merge-file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/merge-file.c b/builtin/merge-file.c index c923bbf2abb..607c3d3f9e1 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -26,9 +26,9 @@ static int label_cb(const struct option *opt, const char *arg, int unset) int cmd_merge_file(int argc, const char **argv, const char *prefix) { const char *names[3] = { 0 }; - mmfile_t mmfs[3] = { 0 }; + mmfile_t mmfs[3] = { { 0 } }; mmbuffer_t result = { 0 }; - xmparam_t xmp = { 0 }; + xmparam_t xmp = { { 0 } }; int ret = 0, i = 0, to_stdout = 0; int quiet = 0; struct option options[] = { From patchwork Thu Oct 6 19:43:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Hostetler X-Patchwork-Id: 13000702 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3D32C433FE for ; Thu, 6 Oct 2022 19:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232088AbiJFTna (ORCPT ); Thu, 6 Oct 2022 15:43:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232057AbiJFTnW (ORCPT ); Thu, 6 Oct 2022 15:43:22 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65B43E319F for ; Thu, 6 Oct 2022 12:43:20 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id j7so4244897wrr.3 for ; Thu, 06 Oct 2022 12:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=joOIf5y1TlPqrhNMiSzaXmom0S+kqc5lnXmlHF0kZw0=; b=PFfxTrVyLhCRMDvawi57VwiyXKvdlfGxllvPCZNEfyJVjWTeKKPsrQBSXXT+S7Tty3 L4K6wKmPpH3YssmBhCjMGbUsWsmn/icUA8i/x4QQvi0fTAuMDMkak19Hk6eWXbOzcejO rjROR5DPUd2W6zjbcab19+boeLXNH0pa6FSIE8kJTJDQCdLfp/NDTA0FjuxPKu2Jo/TW DXjy08iIFw0onNGdJLNvgKdL510cXkH62xlmBuU0aQGYXds04xyQ30Lv2kOwSFO0uXgG dYUclAeqYjRnuAxg9ZzSxKzc+wP8rKEovH9OAHaSMYEQGqGv4SfiIfwsth8SW8X0v5wr RqFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=joOIf5y1TlPqrhNMiSzaXmom0S+kqc5lnXmlHF0kZw0=; b=5ZW/xeVh6ImyDzAnxTE3ZlzWTgAWXReVATp140sooaCPHiSfJWIAb3k1WuPSXxWv5N m+jVNXumWL52cRp1OmgZT4pLCjrbxGjN2/UqPoiip04y31hmLXPAwRYGKC2kYpTmIIlh kdQ9pwQ86AX5iknpFqLD82Qom2iqTKSUjih5ttUPfxu+Xz13jr7bY3eQD/QfOTOmDMGW GL/sCWWTgXPXorpCYfN/hRI9poqWdY4snFIxQeM4yxkEXFE4ED1+2VIodcmhmB74z57u rvZiV0o6yjnunyyVdic3mJP2K1veV9l/pqBGNC3jgbxxV27iOwrJok0OcJoEzv/FnVm4 U/hQ== X-Gm-Message-State: ACrzQf1boY1L60a7DilTqO+PAZnkIlmh8a8nXca1jQ6cNZRJKtlHaS0i YkrPbtyjOAKoLDsHnH+2UoF8yDxmr38= X-Google-Smtp-Source: AMsMyM4/lST/iO16VVPOnwKv82ca0tVnIhB44JqmOX4RziJRh7vmbCXt9b/H45AuY4ZebaIxLWsn1w== X-Received: by 2002:adf:ef43:0:b0:22d:c507:dd48 with SMTP id c3-20020adfef43000000b0022dc507dd48mr1011383wrp.416.1665085398699; Thu, 06 Oct 2022 12:43:18 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m11-20020adfdc4b000000b0022e6da05e43sm158056wrj.89.2022.10.06.12.43.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 12:43:18 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Thu, 06 Oct 2022 19:43:15 +0000 Subject: [PATCH 2/2] builtin/unpack-objects.c: fix compiler error on MacOS with clang 11.0.0 Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jeff Hostetler , Jeff Hostetler Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jeff Hostetler From: Jeff Hostetler Add an extra set of braces around zero initialization of the `zstream` variable to resolve compiler error/warning from clang 11.0.0 on MacOS. This is not needed on clang 14.0. $ make builtin/unpack-objects.o CC builtin/unpack-objects.o builtin/unpack-objects.c:388:26: error: suggest braces around \ initialization of subobject [-Werror,-Wmissing-braces] git_zstream zstream = { 0 }; ^ {} 1 error generated. make: *** [builtin/unpack-objects.o] Error 1 Signed-off-by: Jeff Hostetler --- builtin/unpack-objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 43789b8ef29..4b16f1592ba 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -385,7 +385,7 @@ static const void *feed_input_zstream(struct input_stream *in_stream, static void stream_blob(unsigned long size, unsigned nr) { - git_zstream zstream = { 0 }; + git_zstream zstream = { { 0 } }; struct input_zstream_data data = { 0 }; struct input_stream in_stream = { .read = feed_input_zstream,