All of lore.kernel.org
 help / color / mirror / Atom feed
From: shejialuo <shejialuo@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Patrick Steinhardt <ps@pks.im>, Jeff King <peff@peff.net>
Subject: [PATCH v3 2/8] string-list: remove unused "insert_at" parameter from add_entry
Date: Sun, 29 Jun 2025 12:27:49 +0800	[thread overview]
Message-ID: <aGDAxQKvqecRqG7U@ArchLinux> (raw)
In-Reply-To: <aGDAZ6a0-PyXXGmK@ArchLinux>

In "add_entry", we accept "insert_at" parameter which must be either -1
(auto) or between 0 and `list->nr` inclusive. Any other value is
invalid. When caller specify any invalid "insert_at" value, we won't
check the range and move the element, which would definitely cause the
trouble.

However, we only use "add_entry" in "string_list_insert" function and we
always pass the "-1" for "insert_at" parameter. So, we never use this
parameter to insert element in a user specified position.

And we should know why there is such code path in the first place. We
used to have another function "string_list_insert_at_index()", which
uses the extra "insert_at" parameter. And in f8c4ab611a (string_list:
remove string_list_insert_at_index() from its API, 2014-11-24), we
remove this function but we don't clean all the code path.

Let's simply delete this parameter as we'd better use "strmap" for such
functionality.

Signed-off-by: shejialuo <shejialuo@gmail.com>
---
 string-list.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/string-list.c b/string-list.c
index 801ece0cba..8540c29bc9 100644
--- a/string-list.c
+++ b/string-list.c
@@ -41,10 +41,10 @@ static int get_entry_index(const struct string_list *list, const char *string,
 }
 
 /* returns -1-index if already exists */
-static int add_entry(int insert_at, struct string_list *list, const char *string)
+static int add_entry(struct string_list *list, const char *string)
 {
 	int exact_match = 0;
-	int index = insert_at != -1 ? insert_at : get_entry_index(list, string, &exact_match);
+	int index = get_entry_index(list, string, &exact_match);
 
 	if (exact_match)
 		return -1 - index;
@@ -63,7 +63,7 @@ static int add_entry(int insert_at, struct string_list *list, const char *string
 
 struct string_list_item *string_list_insert(struct string_list *list, const char *string)
 {
-	int index = add_entry(-1, list, string);
+	int index = add_entry(list, string);
 
 	if (index < 0)
 		index = -1 - index;
-- 
2.50.0


  parent reply	other threads:[~2025-06-29  4:27 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-22 14:53 [PATCH 0/5] enhance "string_list" code and test shejialuo
2025-04-22 14:54 ` [PATCH 1/5] string-list: fix sign compare warnings shejialuo
2025-04-22 21:02   ` Junio C Hamano
2025-04-24 12:27     ` shejialuo
2025-04-22 14:54 ` [PATCH 2/5] u-string-list: move "test_split" into "u-string-list.c" shejialuo
2025-04-22 21:27   ` Junio C Hamano
2025-04-24 12:50     ` shejialuo
2025-04-23 11:52   ` Patrick Steinhardt
2025-04-24 12:53     ` shejialuo
2025-04-22 14:55 ` [PATCH 3/5] u-string-list: move "test_split_in_place" to "u-string-list.c" shejialuo
2025-04-23 11:53   ` Patrick Steinhardt
2025-04-22 14:55 ` [PATCH 4/5] u-string-list: move "filter string" test " shejialuo
2025-04-22 14:55 ` [PATCH 5/5] u-string-list: move "remove duplicates" " shejialuo
2025-04-23 11:53   ` Patrick Steinhardt
2025-04-24 12:56     ` shejialuo
2025-05-18 15:55 ` [PATCH v2 0/8] enhance "string_list" code and test shejialuo
2025-05-18 15:56   ` [PATCH v2 1/8] string-list: fix sign compare warnings for loop iterator shejialuo
2025-05-19  7:17     ` Patrick Steinhardt
2025-05-26 13:50       ` shejialuo
2025-05-18 15:57   ` [PATCH v2 2/8] string-list: remove unused "insert_at" parameter from add_entry shejialuo
2025-05-19  7:17     ` Patrick Steinhardt
2025-05-26 13:52       ` shejialuo
2025-05-19  7:51     ` Jeff King
2025-05-26 14:01       ` shejialuo
2025-05-26 14:21         ` Patrick Steinhardt
2025-05-18 15:57   ` [PATCH v2 3/8] string-list: return index directly when inserting an existing element shejialuo
2025-05-19  7:18     ` Patrick Steinhardt
2025-05-26 14:13       ` shejialuo
2025-05-19  7:58     ` Jeff King
2025-05-26 14:20       ` shejialuo
2025-05-18 15:57   ` [PATCH v2 4/8] string-list: enable sign compare warnings check shejialuo
2025-05-19  7:18     ` Patrick Steinhardt
2025-05-26 14:27       ` shejialuo
2025-05-18 15:57   ` [PATCH v2 5/8] u-string-list: move "test_split" into "u-string-list.c" shejialuo
2025-05-19  7:17     ` Patrick Steinhardt
2025-05-18 15:57   ` [PATCH v2 6/8] u-string-list: move "test_split_in_place" to "u-string-list.c" shejialuo
2025-05-18 15:58   ` [PATCH v2 7/8] u-string-list: move "filter string" test " shejialuo
2025-05-19  7:18     ` Patrick Steinhardt
2025-05-26 14:33       ` shejialuo
2025-05-18 15:58   ` [PATCH v2 8/8] u-string-list: move "remove duplicates" " shejialuo
2025-05-19  7:18     ` Patrick Steinhardt
2025-06-29  4:26   ` [PATCH v3 0/8] enhance "string_list" code and test shejialuo
2025-06-29  4:27     ` [PATCH v3 1/8] string-list: fix sign compare warnings for loop iterator shejialuo
2025-06-29  4:27     ` shejialuo [this message]
2025-06-29  4:27     ` [PATCH v3 3/8] string-list: return index directly when inserting an existing element shejialuo
2025-06-29  4:28     ` [PATCH v3 4/8] string-list: enable sign compare warnings check shejialuo
2025-06-29  4:28     ` [PATCH v3 5/8] u-string-list: move "test_split" into "u-string-list.c" shejialuo
2025-06-29  4:28     ` [PATCH v3 6/8] u-string-list: move "test_split_in_place" to "u-string-list.c" shejialuo
2025-06-29  4:28     ` [PATCH v3 7/8] u-string-list: move "filter string" test " shejialuo
2025-06-29  4:28     ` [PATCH v3 8/8] u-string-list: move "remove duplicates" " shejialuo
2025-07-04  5:24     ` [PATCH v3 0/8] enhance "string_list" code and test Patrick Steinhardt
2025-07-07 15:10       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aGDAxQKvqecRqG7U@ArchLinux \
    --to=shejialuo@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.