From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: (unknown) Date: Wed, 5 Dec 2007 19:00:47 +0000 (GMT) Message-ID: References: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Wed Dec 05 20:01:59 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IzzVO-0001Bp-Rv for gcvg-git-2@gmane.org; Wed, 05 Dec 2007 20:01:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751589AbXLETBQ (ORCPT ); Wed, 5 Dec 2007 14:01:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751592AbXLETBQ (ORCPT ); Wed, 5 Dec 2007 14:01:16 -0500 Received: from mail.gmx.net ([213.165.64.20]:37909 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750862AbXLETBP (ORCPT ); Wed, 5 Dec 2007 14:01:15 -0500 Received: (qmail invoked by alias); 05 Dec 2007 19:01:14 -0000 Received: from unknown (EHLO [138.251.11.74]) [138.251.11.74] by mail.gmx.net (mp048) with SMTP; 05 Dec 2007 20:01:14 +0100 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX19XmNVSIU9X0AVqbI5AYtFtyVAk223t8lxxzQ9TQb 9933vBqeOCV1rc X-X-Sender: gene099@racer.site In-Reply-To: X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: [PATCH 1/6] path-list: add functions to work with unsorted lists Up to now, path-lists were sorted at all times. But sometimes it is much more convenient to build the list and sort it at the end, or sort it not at all. Add path_list_append() and sort_path_list() to allow that. Also, add the unsorted_path_list_has_path() function, to do a linear search. Signed-off-by: Johannes Schindelin --- I should have done this much earlier... path-list.c | 30 ++++++++++++++++++++++++++++++ path-list.h | 8 +++++++- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/path-list.c b/path-list.c index 3d83b7b..92e5cf2 100644 --- a/path-list.c +++ b/path-list.c @@ -102,3 +102,33 @@ void print_path_list(const char *text, const struct path_list *p) for (i = 0; i < p->nr; i++) printf("%s:%p\n", p->items[i].path, p->items[i].util); } + +struct path_list_item *path_list_append(const char *path, struct path_list *list) +{ + ALLOC_GROW(list->items, list->nr + 1, list->alloc); + list->items[list->nr].path = + list->strdup_paths ? xstrdup(path) : (char *)path; + return list->items + list->nr++; +} + +static int cmp_items(const void *a, const void *b) +{ + const struct path_list_item *one = a; + const struct path_list_item *two = b; + return strcmp(one->path, two->path); +} + +void sort_path_list(struct path_list *list) +{ + qsort(list->items, list->nr, sizeof(*list->items), cmp_items); +} + +int unsorted_path_list_has_path(struct path_list *list, const char *path) +{ + int i; + for (i = 0; i < list->nr; i++) + if (!strcmp(path, list->items[i].path)) + return 1; + return 0; +} + diff --git a/path-list.h b/path-list.h index 5931e2c..ca2cbba 100644 --- a/path-list.h +++ b/path-list.h @@ -13,10 +13,16 @@ struct path_list }; void print_path_list(const char *text, const struct path_list *p); +void path_list_clear(struct path_list *list, int free_util); +/* Use these functions only on sorted lists: */ int path_list_has_path(const struct path_list *list, const char *path); -void path_list_clear(struct path_list *list, int free_util); struct path_list_item *path_list_insert(const char *path, struct path_list *list); struct path_list_item *path_list_lookup(const char *path, struct path_list *list); +/* Use these functions only on unsorted lists: */ +struct path_list_item *path_list_append(const char *path, struct path_list *list); +void sort_path_list(struct path_list *list); +int unsorted_path_list_has_path(struct path_list *list, const char *path); + #endif /* PATH_LIST_H */ -- 1.5.3.7.2157.g9598e