From: Antoine Pelisse <apelisse@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Antoine Pelisse <apelisse@gmail.com>, git <git@vger.kernel.org>
Subject: [PATCH 01/10] list_lookup: create case and length search
Date: Sat, 5 Jan 2013 22:26:37 +0100 [thread overview]
Message-ID: <1357421206-5014-2-git-send-email-apelisse@gmail.com> (raw)
In-Reply-To: <1357421206-5014-1-git-send-email-apelisse@gmail.com>
Create a new function to look-up a string in a string_list, but:
- add a new parameter to ignore case differences
- add a length parameter to search for a substring
The idea is to avoid several copies (lowering a string before searching
it when we just want to ignore case), or copying a substring of a bigger
string to search it in the string_list
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
---
string-list.c | 30 ++++++++++++++++++++++++------
string-list.h | 2 ++
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/string-list.c b/string-list.c
index 397e6cf..f06e110 100644
--- a/string-list.c
+++ b/string-list.c
@@ -4,13 +4,21 @@
/* if there is no exact match, point to the index where the entry could be
* inserted */
static int get_entry_index(const struct string_list *list, const char *string,
- int *exact_match)
+ int *exact_match, int case_sensitive, size_t n)
{
int left = -1, right = list->nr;
while (left + 1 < right) {
+ int compare;
int middle = (left + right) / 2;
- int compare = strcmp(string, list->items[middle].string);
+ if (case_sensitive)
+ compare = strncmp(string, list->items[middle].string, n);
+ else
+ compare = strncasecmp(string, list->items[middle].string, n);
+ /* Make sure our string is not a substring of item string */
+ if (!compare && n != -1)
+ if (list->items[middle].string[n] != '\0')
+ compare = -1;
if (compare < 0)
right = middle;
else if (compare > 0)
@@ -29,7 +37,7 @@ static int get_entry_index(const struct string_list *list, const char *string,
static int add_entry(int insert_at, 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 = insert_at != -1 ? insert_at : get_entry_index(list, string, &exact_match, 1, -1);
if (exact_match)
return -1 - index;
@@ -70,7 +78,7 @@ struct string_list_item *string_list_insert_at_index(struct string_list *list,
int string_list_has_string(const struct string_list *list, const char *string)
{
int exact_match;
- get_entry_index(list, string, &exact_match);
+ get_entry_index(list, string, &exact_match, 1, -1);
return exact_match;
}
@@ -78,7 +86,7 @@ int string_list_find_insert_index(const struct string_list *list, const char *st
int negative_existing_index)
{
int exact_match;
- int index = get_entry_index(list, string, &exact_match);
+ int index = get_entry_index(list, string, &exact_match, 1, -1);
if (exact_match)
index = -1 - (negative_existing_index ? index : 0);
return index;
@@ -86,7 +94,17 @@ int string_list_find_insert_index(const struct string_list *list, const char *st
struct string_list_item *string_list_lookup(struct string_list *list, const char *string)
{
- int exact_match, i = get_entry_index(list, string, &exact_match);
+ int exact_match, i = get_entry_index(list, string, &exact_match, 1, -1);
+ if (!exact_match)
+ return NULL;
+ return list->items + i;
+}
+
+struct string_list_item *string_list_lookup_extended(struct string_list *list,
+ const char *string, int case_sensitive, size_t n)
+{
+ int exact_match, i = get_entry_index(list, string, &exact_match,
+ case_sensitive, n);
if (!exact_match)
return NULL;
return list->items + i;
diff --git a/string-list.h b/string-list.h
index c50b0d0..4f5ae19 100644
--- a/string-list.h
+++ b/string-list.h
@@ -62,6 +62,8 @@ struct string_list_item *string_list_insert(struct string_list *list, const char
struct string_list_item *string_list_insert_at_index(struct string_list *list,
int insert_at, const char *string);
struct string_list_item *string_list_lookup(struct string_list *list, const char *string);
+struct string_list_item *string_list_lookup_extended(struct string_list *list,
+ const char *string, int case_sensitive, size_t n);
/*
* Remove all but the first of consecutive entries with the same
--
1.7.12.4.3.g2036a08.dirty
next prev parent reply other threads:[~2013-01-05 21:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-05 21:26 [PATCH 00/10] Log mailmap optimization Antoine Pelisse
2013-01-05 21:26 ` Antoine Pelisse [this message]
2013-01-05 22:39 ` [PATCH 01/10] list_lookup: create case and length search Junio C Hamano
2013-01-07 22:37 ` Junio C Hamano
2013-01-05 21:26 ` [PATCH 02/10] Use split_ident_line to parse author and committer Antoine Pelisse
2013-01-05 21:26 ` [PATCH 03/10] mailmap: remove email copy and length limitation Antoine Pelisse
2013-01-05 21:26 ` [PATCH 04/10] mailmap: simplify map_user() interface Antoine Pelisse
2013-01-06 22:56 ` Junio C Hamano
2013-01-05 21:26 ` [PATCH 05/10] mailmap: add mailmap structure to rev_info and pp Antoine Pelisse
2013-01-05 21:26 ` [PATCH 06/10] pretty: use mailmap to display username and email Antoine Pelisse
2013-01-05 21:26 ` [PATCH 07/10] log: add --use-mailmap option Antoine Pelisse
2013-01-05 21:26 ` [PATCH 08/10] test: add test for " Antoine Pelisse
2013-01-05 21:26 ` [PATCH 09/10] log: grep author/committer using mailmap Antoine Pelisse
2013-01-05 21:26 ` [PATCH 10/10] log: add log.mailmap configuration option Antoine Pelisse
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357421206-5014-2-git-send-email-apelisse@gmail.com \
--to=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).