djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename str_join -> strjoin to make it not clash with objstr's one.

Browse Source
This commit is contained in:
Paul Sokolovsky 2014-02-11 12:19:06 +02:00
parent af19cbd201
commit a075741c90
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unix/main.c
View File

@ -81,7 +81,7 @@ static void execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind
}
}
static char *str_join(const char *s1, int sep_char, const char *s2) {
static char *strjoin(const char *s1, int sep_char, const char *s2) {
int l1 = strlen(s1);
int l2 = strlen(s2);
char *s = m_new(char, l1 + l2 + 2);
@ -133,7 +133,7 @@ static void do_repl(void) {
if (line2 == NULL || strlen(line2) == 0) {
break;
}
char *line3 = str_join(line, '\n', line2);
char *line3 = strjoin(line, '\n', line2);
free(line);
free(line2);
line = line3;