From patchwork Tue Nov 26 11:18:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11261975 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BEB97913 for ; Tue, 26 Nov 2019 11:18:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 935BE2073F for ; Tue, 26 Nov 2019 11:18:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=web.de header.i=@web.de header.b="DVvlNZug" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727319AbfKZLSf (ORCPT ); Tue, 26 Nov 2019 06:18:35 -0500 Received: from mout.web.de ([212.227.15.14]:34333 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726049AbfKZLSe (ORCPT ); Tue, 26 Nov 2019 06:18:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1574767108; bh=N8YSW6L6dTBB5ygwZ8c77AdOigo1bPg7VIP0xb9ZMWs=; h=X-UI-Sender-Class:To:Cc:From:Subject:Date; b=DVvlNZug5Wg3WpPlbuZvW3qaOhGYKo5givuYAju9N8G1tNUBFZlUnfeY/FEbeXqPR UvfYw9K8pJUu6g8FtsUtIMbZ2GGEcNsknxB7E5K0Jggh3Qj7PE3VhEFAapmktmNr54 LzYSUBszdy2FL1zhTUMAHvnvBN2CGij1ONfJsGXc= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.26] ([91.47.146.29]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LvS5r-1hs4zn1YMF-010f6j; Tue, 26 Nov 2019 12:18:28 +0100 To: Git Mailing List Cc: Junio C Hamano From: =?utf-8?q?Ren=C3=A9_Scharfe?= Subject: [PATCH] fetch: use skip_prefix() instead of starts_with() Message-ID: Date: Tue, 26 Nov 2019 12:18:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 Content-Language: en-US X-Provags-ID: V03:K1:InwH/Z95mL3hh+ojzMKa2v1A68NQhOtrqBzKTABQoRGWnluc016 Z5+QaLMreBH6bG9+CnbKNyR5AwNRNTaGeOM3pT8jzIiVbEq8TD+1cNZBBYgqz+ZWcgQ6kEU H3XmQ53ZzsF/RarVqCj+SdUULjNgfRNJwdGARaanJCjnT88JkXw26ciX6h6nQFAKg6e2rX6 b6SKy9ACkZZSvvu2CGsJg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:iApyFfi7MNA=:9rqro3hJ7rgFDSbrwcQbsy VoSjQ8Twz6o5yXLpyKWIvgQeeGUM/kjONvaf0PJSJtsU1VMJh0fcjO+FZ6el36t6k7t4elclr Y52cwbrKNT/HmLGQUHgwAQmK3B3xdgu7i2WM5SJwCQ33j012h1U+3tXtPphshXUsaV17y33br lENbIsNCXticG8lx9MaFfN7XxH1papGeXOxLaFcARt2nevC4zdeIJzLN7h4UH8z1qV+g8GmIc 7gkxuvGYKGdS62FZwCT1XwdZeDEt+LjRsmyucO4cjfOlAjThuKj5L+KORwzHyMxq+G2b0jQck hXnKgsvM3ocQenXZQk30waJUf07ROT48YM4tJ7fFRTWfVbLK1kl6kXgjKAQAW7vt4H4au7oko P4HvaaJkDpkohDy7eRedZYYDSTeecyiwJdc26WiXlXlf/BhQIQ5saR1FoR4ic2YgPcEV3qWdx DpW1LSyX6d0b4zGUx8nWcOM5MPFLMi4JoB3kM6eMyBBDLl/B1k6j5VQG56QDrawj6At6Rr/jD iXRIWiV0t8dNQjR1GBMTjEfbOUbAijRoS5skI4XxYJ+KRlR6LdP4xTPIDZ0eomH6ho2CYOfaU ym30SAKFJ9FfG+GrvhHh71kO9ZEeGKdIsOACm2Vh6H5eWxLawTH/hPOGCARis7P3sgSjupTNS 9QWRz4lfMxHZiSfHqvi8JX8h416xnhDzpLTRa0BkGyDUohNXlZrVvQ9/6Ll0VR57CFmhUehRO qCQ7uLVyqkdq0GiWLWkalsWn5fPN6Bx+qX92DkhLVLGSK+MYzeX23hq3Z3aY47XPw614BJIpY ct9sEiq6WaNzC5yOJzKOX5VzZbPTLBkIegRb+U3NopjaMtvYyADxcrXy7CKM2bdx9Anv6sz4f srHRLGGLLcM4ll5xlt3EOzMiXiINiXdcCVZDU6KSoVxia2lR8xj/WzqRgeDqN1lMXPvsZs1J/ FZ56TESPkFDjkySwMBf4x8sqGKMOxvUcQauAz2itThST7LWR+EWxdJ9SW0vyoatuIB+Hj0D5H Yv2n4QEgioI6d88nzLuEA9JGIogvvFCup9SGLC5MZZEXxIgfHuVl2LLZTftiYvL5CErWBQcZe MloGFqI0gvvvevHACcqDKBqBOhxmPHjlTFx0Dm4dkM6eMZ3t7zE4NXEL0yptC7rWT10uYKn4v rUCwWxTWG9dsq4nhAZCghAidTpZAOnBph6ZlB91gQn5HRx/iXk67ZfSGLREC0Eabhk33BO6kz x0PyTaMo7n7lMtRjFYteh2V/zsIHpvKtg4F+RPw== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Get rid of magic numbers by letting skip_prefix() set the pointer "what". Signed-off-by: René Scharfe --- builtin/fetch.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) -- 2.24.0 diff --git a/builtin/fetch.c b/builtin/fetch.c index 863c858fde..02e8619618 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -954,18 +954,12 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, kind = ""; what = ""; } - else if (starts_with(rm->name, "refs/heads/")) { + else if (skip_prefix(rm->name, "refs/heads/", &what)) kind = "branch"; - what = rm->name + 11; - } - else if (starts_with(rm->name, "refs/tags/")) { + else if (skip_prefix(rm->name, "refs/tags/", &what)) kind = "tag"; - what = rm->name + 10; - } - else if (starts_with(rm->name, "refs/remotes/")) { + else if (skip_prefix(rm->name, "refs/remotes/", &what)) kind = "remote-tracking branch"; - what = rm->name + 13; - } else { kind = ""; what = rm->name;