aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/librc-strlist.c22
-rw-r--r--src/rc.h2
2 files changed, 12 insertions, 12 deletions
diff --git a/src/librc-strlist.c b/src/librc-strlist.c
index 4c72cf45..ac861524 100644
--- a/src/librc-strlist.c
+++ b/src/librc-strlist.c
@@ -121,30 +121,30 @@ char **rc_strlist_delete (char **list, const char *item)
}
librc_hidden_def(rc_strlist_delete)
-char **rc_strlist_join (char **this, char **that)
+char **rc_strlist_join (char **list1, char **list2)
{
char **newlist;
int i = 0;
int j = 0;
- if (! this && that)
- return (that);
- if (! that && this)
- return (this);
- if (! that && ! this)
+ if (! list1 && list2)
+ return (list2);
+ if (! list2 && list1)
+ return (list1);
+ if (! list1 && ! list2)
return (NULL);
- while (this[i])
+ while (list1[i])
i++;
- while (that[j])
+ while (list2[j])
j++;
- newlist = rc_xrealloc (this, sizeof (char *) * (i + j + 1));
+ newlist = rc_xrealloc (list1, sizeof (char *) * (i + j + 1));
j = 0;
- while (that[j]) {
- newlist[i] = that[j];
+ while (list2[j]) {
+ newlist[i] = list2[j];
i++;
j++;
}
diff --git a/src/rc.h b/src/rc.h
index b2d74082..9920901c 100644
--- a/src/rc.h
+++ b/src/rc.h
@@ -204,7 +204,7 @@ char **rc_strlist_addsort (char **list, const char *item);
char **rc_strlist_addsortc (char **list, const char *item);
char **rc_strlist_addsortu (char **list, const char *item);
char **rc_strlist_delete (char **list, const char *item);
-char **rc_strlist_join (char **this, char **that);
+char **rc_strlist_join (char **list1, char **list2);
void rc_strlist_reverse (char **list);
void rc_strlist_free (char **list);