Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1235602ybi; Fri, 14 Jun 2019 10:54:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDnsOSHgEt1FTWFEwIqmd17roTHfpH8QWCBxHowrpQ4BrQC4NvsBdwyFP4LdR5tKcXy9qR X-Received: by 2002:a63:5024:: with SMTP id e36mr38282221pgb.220.1560534895487; Fri, 14 Jun 2019 10:54:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560534895; cv=none; d=google.com; s=arc-20160816; b=HjZ7es0spLMp4y5psBxpuA0W99XZB55lFXR8ZKOgPKcL4z1fdyirYYcXANdbQzOKdu Hfimfr3rvqKypFfKCa9gFL70f+wLxxqBWwiR15IYtlr6Sw8GytieDxBl8w3kCrNGxWMV g/Qcdyh/bE6I9TvO8nO6qgabMJKCBf9HWM54TdCIeDecI7kM+WaNiqHEcWnszijyEST7 9h7frfs/2M7LGlw0JKp++qc92XSVKap6wF8H0jA5z35l/2+4kzb9lmTw6+C5Eg+o/6ic TJq5vaaZQYvpHhPY3jWIhvbhNVuXMrbUifkYaejkyy239Ak3ZzvGTG722FnHezREkRBx 0WSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=f7XUa/lQlxySmEWEcJcuTSMuU+ZsEK8Uqolu3z7EFDA=; b=XcOFIVHUEKe7JFxmm6GZUNp1qqRyWGXOmEHjkX3hUJYY4G8dn1cROiF2/y7jyR/+3o worf0YsiDkkxEFYvVI1p18GGu9OZ9sQkIDhOv62cRfw3V1W7CBwaZvCPm2KHcL//bPf7 vY/1ruSeBHaCXdgv4BQM1wqZ2LaoLburgBRnxQY1R8+lCF/+PhBEhCV4i9VE1YmMv90Z jI+5tJTPi6Wey4FwXuVmmFglB4Xe47+76rMQ51NhrMOoMnNm/QYo+IiGBHzMNKC7R8ZL tSSD7pTokY6fP1m8SdNZSDONBGm72GcbyegHrEAIKp4N6mLUszdiSg/D/eA2MuTQv/Ji HGKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=Pp67UvWQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a11si3136584pgj.537.2019.06.14.10.54.40; Fri, 14 Jun 2019 10:54:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=Pp67UvWQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727375AbfFNRxt (ORCPT + 99 others); Fri, 14 Jun 2019 13:53:49 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:38616 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726397AbfFNRwe (ORCPT ); Fri, 14 Jun 2019 13:52:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=f7XUa/lQlxySmEWEcJcuTSMuU+ZsEK8Uqolu3z7EFDA=; b=Pp67UvWQoNL5haPkZ7R8Xthq8N QawMGfQ4+60R72PEbqX7B3+/DxjITPqAzR/ZnZvDOOLI0cX6yAo9TG84HvSBUmwBUJCfJrgjHw9KJ 5j1IBek8OSO+l4sPBmyWxj8NbuJ8cFa9N6bUhkgo7Y8CQ0I+aUT3bo8sdICO6JbceS2j/34IqxqY7 P1h9C57qyJ2XDB04CQCYmTBgx9uADJkiHodQomCwA7wO+aXxMPVY2FyoElJffUfGErL6B+Qg9+TPE MarrwVpeEh6ILKrMw3VFjX91PQJb1mZhkjAC+56GwozixSErKkPjSU8TlJZn7Gtc60kTVE2fLDBXb CL/DokfA==; Received: from 177.133.85.52.dynamic.adsl.gvt.net.br ([177.133.85.52] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hbqNO-0000PX-IZ; Fri, 14 Jun 2019 17:52:34 +0000 Received: from mchehab by bombadil.infradead.org with local (Exim 4.92) (envelope-from ) id 1hbqNL-0002P2-Ul; Fri, 14 Jun 2019 14:52:31 -0300 From: Mauro Carvalho Chehab To: Linux Doc Mailing List , Greg Kroah-Hartman Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Jonathan Corbet Subject: [PATCH v2 10/16] scripts/get_abi.pl: avoid creating duplicate names Date: Fri, 14 Jun 2019 14:52:24 -0300 Message-Id: <23c67f22ebdf43b3cf17798e451311871841a0df.1560534648.git.mchehab+samsung@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <3b8d7c64f887ddea01df3c4eeabc745c8ec45406.1560534648.git.mchehab+samsung@kernel.org> References: <3b8d7c64f887ddea01df3c4eeabc745c8ec45406.1560534648.git.mchehab+samsung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The file the Documentation/ABI/testing/sysfs-class-power has voltage_min, voltage_max and voltage_now symbols duplicated. They are defined first for "General Properties" and then for "USB Properties". This cause those warnings: get_abi.pl rest --dir $srctree/Documentation/ABI/testing:26933: WARNING: Duplicate explicit target name: "abi_sys_class_power_supply_supply_name_voltage_max". get_abi.pl rest --dir $srctree/Documentation/ABI/testing:26968: WARNING: Duplicate explicit target name: "abi_sys_class_power_supply_supply_name_voltage_min". get_abi.pl rest --dir $srctree/Documentation/ABI/testing:27008: WARNING: Duplicate explicit target name: "abi_sys_class_power_supply_supply_name_voltage_now". And, as the references are not valid, it will also generate warnings about links to undefined references. Fix it by storing labels into a hash table and, when a duplicated one is found, appending random characters at the end. Signed-off-by: Mauro Carvalho Chehab --- scripts/get_abi.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/get_abi.pl b/scripts/get_abi.pl index 116f0c33c16d..329ace635ac2 100755 --- a/scripts/get_abi.pl +++ b/scripts/get_abi.pl @@ -194,6 +194,8 @@ sub parse_abi { # Outputs the book on ReST format # +my %labels; + sub output_rest { foreach my $what (sort { ($data{$a}->{type} eq "File") cmp ($data{$b}->{type} eq "File") || @@ -217,6 +219,13 @@ sub output_rest { $label =~ s,_+,_,g; $label =~ s,_$,,; + # Avoid duplicated labels + while (defined($labels{$label})) { + my @chars = ("A".."Z", "a".."z"); + $label .= $chars[rand @chars]; + } + $labels{$label} = 1; + $data{$what}->{label} .= $label; printf ".. _%s:\n\n", $label; -- 2.21.0