From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from black.elm.relay.mailchannels.net (black.elm.relay.mailchannels.net [23.83.212.19]) by sourceware.org (Postfix) with ESMTPS id 213183858CDB for ; Thu, 18 May 2023 15:56:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 213183858CDB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B7EC06C17CD; Thu, 18 May 2023 15:56:35 +0000 (UTC) Received: from pdx1-sub0-mail-a306.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 482A86C13F2; Thu, 18 May 2023 15:56:35 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1684425395; a=rsa-sha256; cv=none; b=ZCj4EU53qDIk4yBhVxod7kc6mQWt73RefyMA0n2y9AFpcCTOWwP27R7iNwq08Yu/HHPSv3 oFUiF3dHP1PCgeWtXh4hvwOXfEmWb7sIDe98pBfCr9eozFYeW8W6UJW3QPD68cPvit08PY VYKEdxU1tfrkwJQ53ujJLkR4W+KaV4iQOlfzLY0Kdydl033+Ini2bI3MQHnUo/aBGkS6Sh 1qlvsZUDE97nGNwynXSfhterTcAp27LDmPSg6WNTX3yk/WB1xpPma1VDm43K9oqneJi4r4 XOpCbmsD7mCx2UotZ5NNYmLiUzSRPd9H1CDe2s1Jmp+a4zIZHYvMkXUpCb6EMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1684425395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZfzFRyuacXif8UMluBB9uHRLW8EepmRH6yyl2+F6ZyI=; b=HCQwqZAS0U7URzdPG2v8JQIxs6hl9Xn1bXIpUoy882OOv7foD3aQ3BuRvSktKkLKivtqIw x443XhZfJieKgDwENXYO6tNxZc63fE90chU/4IurkfnoIEc4PuaNc5VIWM9KkYnAxbrGJ+ gdvq+geJwmjETtWvaA7bfvU6DqetQnr/2EwVMIsAjBFIbrnh9X+7DIydIRBqzfIPyBn49P FPVNCnrDj1aU/QgmRzMHWkSZA11f20dhWzRROo/HDA6Vpfv/X1db4Zc+QzojBUNfhpXjNL /aAr0ACD94Whz43aJlIeXV403LJNDMLrDTco1f35+NXHGgk6ZT70a/MgtX9P8Q== ARC-Authentication-Results: i=1; rspamd-5cdf8fd7d9-fw8rh; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Little-Battle: 25dcbac217b209f8_1684425395524_1193811712 X-MC-Loop-Signature: 1684425395524:1376378376 X-MC-Ingress-Time: 1684425395524 Received: from pdx1-sub0-mail-a306.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.109.138.48 (trex/6.8.1); Thu, 18 May 2023 15:56:35 +0000 Received: from [192.168.0.182] (bras-vprn-toroon4834w-lp130-02-142-113-138-85.dsl.bell.ca [142.113.138.85]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a306.dreamhost.com (Postfix) with ESMTPSA id 4QMZN23NxSz6m; Thu, 18 May 2023 08:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1684425394; bh=ZfzFRyuacXif8UMluBB9uHRLW8EepmRH6yyl2+F6ZyI=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=WHiMaPw82DtIIDf7dYOrrpTejfwevo/IfDXlDJJatb5F4B3T8zjueZxxFwFsR2Q+R 1yCczWsvYo/NzZY/LXaKeJiLbbV2wVpQE2KsapaWrbsLZL+ohkbRITNf18MJ64Xt6O oqIQhW2TTOGOk2HYzCsSiQJDRFwqQROSQy8FmP2fIOOpRmIxn2irRvNk+VIAFTsYSJ 9Cld8bHfpVFI6Sg4XYkR4DCTxduArYVpQRFc9rvNNtYWWXUeCncznFaUjtgQdlByfr mrmg7U+Yq5amTQJadIyYtPmrFrGY8jGR2Y2cp5xQNU4d5RaIOyxN779oATSzJGfn4J tjfxtJ7LPYxHg== Message-ID: <480a6711-131c-61d2-8497-bbe115dbf0c0@gotplt.org> Date: Thu, 18 May 2023 11:56:33 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH 1/5] scripts: sort-makefile-lines.py Content-Language: en-US To: Carlos O'Donell , libc-alpha@sourceware.org References: <20230518130325.59309-1-carlos@redhat.com> <20230518130325.59309-2-carlos@redhat.com> From: Siddhesh Poyarekar In-Reply-To: <20230518130325.59309-2-carlos@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3038.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 2023-05-18 09:03, Carlos O'Donell wrote: > We must return < 0, 0, or > 0 as the result of the comparison function > for cmp_to_key() to work correctly across all comparisons. > --- LGTM. Reviewed-by: Siddhesh Poyarekar > scripts/sort-makefile-lines.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py > index fd657df970..c0badebf8c 100755 > --- a/scripts/sort-makefile-lines.py > +++ b/scripts/sort-makefile-lines.py > @@ -102,7 +102,10 @@ def glibc_makefile_numeric(string1, string2): > # string1 and string2 both share a prefix and > # have a numeric suffix that can be compared. > # Sort order is based on the numeric suffix. > - return int(var1.group(1)) > int(var2.group(1)) > + # If the suffix is the same return 0, otherwise > + # > 0 for greater-than, and < 0 for less-than. > + # This is equivalent to the numerical difference. > + return int(var1.group(1)) - int(var2.group(1)) > # Default to strcoll. > return locale.strcoll(string1, string2) >