From ebcfd49e9c17cca34d7a8146ae73fe626dde622e Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 11 Oct 2007 10:11:12 +0000 Subject: [PATCH] Fix deleting items from string lists. --- src/librc-strlist.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/librc-strlist.c b/src/librc-strlist.c index 0f3225e9..507f269c 100644 --- a/src/librc-strlist.c +++ b/src/librc-strlist.c @@ -114,24 +114,24 @@ bool rc_strlist_delete (char ***list, const char *item) { char **lst = *list; int i = 0; - bool retval = false; if (!lst || ! item) return (false); - while (lst[i]) - if (! strcmp (lst[i], item)) { + while (lst[i]) { + if (strcmp (lst[i], item) == 0) { free (lst[i]); - retval = true; do { lst[i] = lst[i + 1]; i++; } while (lst[i]); + return (true); } + i++; + } - if (! retval) - errno = ENOENT; - return (retval); + errno = ENOENT; + return (false); } librc_hidden_def(rc_strlist_delete)