diff options
Diffstat (limited to 'src/librc-strlist.c')
| -rw-r--r-- | src/librc-strlist.c | 188 |
1 files changed, 91 insertions, 97 deletions
diff --git a/src/librc-strlist.c b/src/librc-strlist.c index 2fcf0b95..b6ba80ac 100644 --- a/src/librc-strlist.c +++ b/src/librc-strlist.c @@ -16,136 +16,130 @@ char **rc_strlist_add (char **list, const char *item) { - char **newlist; - int i = 0; + char **newlist; + int i = 0; - if (! item) - return (list); + if (! item) + return (list); - while (list && list[i]) - i++; + while (list && list[i]) + i++; - newlist = rc_xrealloc (list, sizeof (char *) * (i + 2)); - newlist[i] = rc_xstrdup (item); - newlist[i + 1] = NULL; + newlist = rc_xrealloc (list, sizeof (char *) * (i + 2)); + newlist[i] = rc_xstrdup (item); + newlist[i + 1] = NULL; - return (newlist); + return (newlist); } static char **_rc_strlist_addsort (char **list, const char *item, - int (*sortfunc) (const char *s1, - const char *s2), - bool uniq) + int (*sortfunc) (const char *s1, + const char *s2), + bool uniq) { - char **newlist; - int i = 0; - char *tmp1; - char *tmp2; - - if (! item) - return (list); - - while (list && list[i]) - { - if (uniq && strcmp (list[i], item) == 0) - return (list); - i++; - } - - newlist = rc_xrealloc (list, sizeof (char *) * (i + 2)); - - if (! i) - newlist[i] = NULL; - newlist[i + 1] = NULL; - - i = 0; - while (newlist[i] && sortfunc (newlist[i], item) < 0) - i++; - - tmp1 = newlist[i]; - newlist[i] = rc_xstrdup (item); - do - { - i++; - tmp2 = newlist[i]; - newlist[i] = tmp1; - tmp1 = tmp2; - } while (tmp1); - - return (newlist); + char **newlist; + int i = 0; + char *tmp1; + char *tmp2; + + if (! item) + return (list); + + while (list && list[i]) { + if (uniq && strcmp (list[i], item) == 0) + return (list); + i++; + } + + newlist = rc_xrealloc (list, sizeof (char *) * (i + 2)); + + if (! i) + newlist[i] = NULL; + newlist[i + 1] = NULL; + + i = 0; + while (newlist[i] && sortfunc (newlist[i], item) < 0) + i++; + + tmp1 = newlist[i]; + newlist[i] = rc_xstrdup (item); + do { + i++; + tmp2 = newlist[i]; + newlist[i] = tmp1; + tmp1 = tmp2; + } while (tmp1); + + return (newlist); } char **rc_strlist_addsort (char **list, const char *item) { - return (_rc_strlist_addsort (list, item, strcoll, false)); + return (_rc_strlist_addsort (list, item, strcoll, false)); } char **rc_strlist_addsortc (char **list, const char *item) { - return (_rc_strlist_addsort (list, item, strcmp, false)); + return (_rc_strlist_addsort (list, item, strcmp, false)); } char **rc_strlist_addsortu (char **list, const char *item) { - return (_rc_strlist_addsort (list, item, strcmp, true)); + return (_rc_strlist_addsort (list, item, strcmp, true)); } char **rc_strlist_delete (char **list, const char *item) { - int i = 0; - - if (!list || ! item) - return (list); - - while (list[i]) - if (! strcmp (list[i], item)) - { - free (list[i]); - do - { - list[i] = list[i + 1]; - i++; - } while (list[i]); - } - - return (list); + int i = 0; + + if (!list || ! item) + return (list); + + while (list[i]) + if (! strcmp (list[i], item)) { + free (list[i]); + do { + list[i] = list[i + 1]; + i++; + } while (list[i]); + } + + return (list); } void rc_strlist_reverse (char **list) { - char *item; - int i = 0; - int j = 0; - - if (! list) - return; - - while (list[j]) - j++; - j--; - - while (i < j && list[i] && list[j]) - { - item = list[i]; - list[i] = list[j]; - list[j] = item; - i++; - j--; - } + char *item; + int i = 0; + int j = 0; + + if (! list) + return; + + while (list[j]) + j++; + j--; + + while (i < j && list[i] && list[j]) { + item = list[i]; + list[i] = list[j]; + list[j] = item; + i++; + j--; + } } void rc_strlist_free (char **list) { - int i = 0; + int i = 0; - if (! list) - return; + if (! list) + return; - while (list[i]) - { - free (list[i]); - list[i++] = NULL; - } + while (list[i]) { + free (list[i]); + list[i++] = NULL; + } - free (list); + free (list); } |