From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Ra1Z8-0007hc-OB for barebox@lists.infradead.org; Mon, 12 Dec 2011 08:48:56 +0000 Date: Mon, 12 Dec 2011 09:48:33 +0100 From: Sascha Hauer Message-ID: <20111212084833.GN27267@pengutronix.de> References: <1323424372-8142-1-git-send-email-a.aring@phytec.de> <1323424372-8142-2-git-send-email-a.aring@phytec.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1323424372-8142-2-git-send-email-a.aring@phytec.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 1/2] stringlist-functions: add sorted insert To: Alexander Aring Cc: barebox@lists.infradead.org On Fri, Dec 09, 2011 at 10:52:47AM +0100, Alexander Aring wrote: > Add sorted insert in stringlist functions. > Also added function to checked if string is already > in string list. > > Signed-off-by: Alexander Aring > --- > include/stringlist.h | 2 ++ > lib/stringlist.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 51 insertions(+), 0 deletions(-) > > diff --git a/include/stringlist.h b/include/stringlist.h > index 3453e9a..c923542 100644 > --- a/include/stringlist.h > +++ b/include/stringlist.h > @@ -9,6 +9,8 @@ struct string_list { > }; > > int string_list_add(struct string_list *sl, char *str); > +int string_list_add_sorted(struct string_list *sl, char *str); > +int string_list_contains(struct string_list *sl, char *str); > void string_list_print_by_column(struct string_list *sl); > > static inline void string_list_init(struct string_list *sl) > diff --git a/lib/stringlist.c b/lib/stringlist.c > index 9ccf8fa..40a0fc9 100644 > --- a/lib/stringlist.c > +++ b/lib/stringlist.c > @@ -3,6 +3,29 @@ > #include > #include > > +static int string_list_compare(struct list_head *a, struct list_head *b) > +{ > + int result = 0; > + char *achr, *bchr; > + achr = ((struct string_list *)(a))->str; > + bchr = ((struct string_list *)(b))->str; > + > + while (*achr != '\0' || *bchr != '\0') { > + result = *achr - *bchr; > + if (result < 0) > + return -1; > + if (result > 0) > + return 0; > + achr++; > + bchr++; > + } Can't you use strcmp here instead? > + > + /* Avoid a endless loop because >=0 insert str in list > + * Insert string if strings are equal or is equal, > + * but lengths are not the same */ > + return 0; > +} > + > int string_list_add(struct string_list *sl, char *str) > { > struct string_list *new; > @@ -16,6 +39,31 @@ int string_list_add(struct string_list *sl, char *str) > return 0; > } > > +int string_list_add_sorted(struct string_list *sl, char *str) > +{ > + struct string_list *new; > + > + new = xmalloc(sizeof(struct string_list) + strlen(str) + 1); > + > + strcpy(new->str, str); > + > + list_add_sort(&new->list, &sl->list, string_list_compare); > + > + return 0; > +} > + > +int string_list_contains(struct string_list *sl, char *str) > +{ > + struct string_list *entry; > + > + list_for_each_entry(entry, &sl->list, list) { > + if (!strcmp(str, entry->str)) > + return 1; > + } > + > + return 0; > +} > + > void string_list_print_by_column(struct string_list *sl) > { > int len = 0, num, i; > @@ -44,3 +92,4 @@ void string_list_print_by_column(struct string_list *sl) > if (i % num) > printf("\n"); > } > + Please don't add trailing new lines. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox