From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id AEB911F619 for ; Thu, 18 Aug 2022 21:42:06 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gNbfHMII"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244314AbiHRVlI (ORCPT ); Thu, 18 Aug 2022 17:41:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345730AbiHRVk7 (ORCPT ); Thu, 18 Aug 2022 17:40:59 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BD3FBD741 for ; Thu, 18 Aug 2022 14:40:59 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ba1so3142564wrb.5 for ; Thu, 18 Aug 2022 14:40:58 -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; bh=Pmssy3NMTu/rhL8RVFQSIiSxL7vJcmdwCs/n+zYEl+0=; b=gNbfHMIIM8jDCrD9+jiSK2MzDqg3tDoybh23xSXm1BfFuZnXv+RpxqxsaIs9XPEvy7 OXZ93QMIMpsyZ63vuHEsIelOW3vCoRynN7aH86sPJ9L62WSxVPVOAvyZOCNwn/dqM/bl BqjnffZaDFCsiqiJ9A8MCmQ58xU0eT8bwaqbb5RcNiOc7fu8XBc7mFsD1vyGokyJcRR4 +57l+fHLzDJtMPQfaSYYzU+tskvtvb91cOFCeWNsqX/IRH12vsSfzPK4DQBFrbUg+Tjv IejqDq1LKULNC8Iq/1I0ajBdNvsAOn+7Gqa9PAE0/Rl7Mb57W5FYN0Bd9x9YQF+TRfH2 g0IQ== 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; bh=Pmssy3NMTu/rhL8RVFQSIiSxL7vJcmdwCs/n+zYEl+0=; b=hmwqSj0/qSH1iZ6IJTticyZzA7VWQIo17gni4P64RSqWCM96uVN2t38sroDxa8jSR/ 4NKnmgulsgBAwsOFb134TCdNmLnpPL3oN2PvMTO1HYgivEO4YWMpeld+/AmBn/S9fkRo MC8V4cOxg3Tpsl8WjP+35dzFfkgh0sdTJSTxj+7gPqaXzMw3C0mowbEqQuMVDKam2DKj iQGTnw3cGeVTtQOkWBWn1aG2jQ5XrbvIC5aIXMBCCaAcCxMb6GOFJ3hMvxh9BpQS0Q2/ DniINCwOFCj5ManjVGP9AI9SdJTYyicOM3Hf6+QvdQOhqFJYr9OwaPxIF0IwleJteLSz e+RA== X-Gm-Message-State: ACgBeo05lzNmESrdzo2BT3aboZQjF6mhPUA44hp7M5jpA/0YteNC0T09 mgPSj5+wCYagJd0wzAW5STT4JKUF4PA= X-Google-Smtp-Source: AA6agR4/L4jeSJxSAUbycGGZCMv9u3ZNSnZXL5z19gvHOxb4NvSD333+zOg4wQJdpg3oJSlyCFvHyw== X-Received: by 2002:a5d:5989:0:b0:221:7c34:3943 with SMTP id n9-20020a5d5989000000b002217c343943mr2425847wri.441.1660858857332; Thu, 18 Aug 2022 14:40:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id az14-20020a05600c600e00b003a536d5aa2esm3474032wmb.11.2022.08.18.14.40.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 14:40:56 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Victoria Dye via GitGitGadget" Date: Thu, 18 Aug 2022 21:40:47 +0000 Subject: [PATCH v3 2/8] scalar-unregister: handle error codes greater than 0 Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: johannes.schindelin@gmx.de, mjcheetham@outlook.com, gitster@pobox.com, Derrick Stolee , Victoria Dye , Victoria Dye Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Victoria Dye When 'scalar unregister' tries to disable maintenance and remove an enlistment, ensure that the return value is nonzero if either operation produces *any* nonzero return value, not just when they return a value less than 0. Signed-off-by: Victoria Dye --- contrib/scalar/scalar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c index 92b648f3511..8ef8dd55041 100644 --- a/contrib/scalar/scalar.c +++ b/contrib/scalar/scalar.c @@ -223,10 +223,10 @@ static int unregister_dir(void) { int res = 0; - if (toggle_maintenance(0) < 0) + if (toggle_maintenance(0)) res = -1; - if (add_or_remove_enlistment(0) < 0) + if (add_or_remove_enlistment(0)) res = -1; return res; -- gitgitgadget