diff --git a/source/arm9/console.c b/source/arm9/console.c index 2bf00de..07852e8 100644 --- a/source/arm9/console.c +++ b/source/arm9/console.c @@ -177,21 +177,8 @@ } } -// strchr() function with length check from WinterMute //--------------------------------------------------------------------------------- -static const char *strnchr(const char *p, char c, size_t n) { -//--------------------------------------------------------------------------------- - if (!p) return 0; - - while (n-- > 0) { - if (*p == c) return p; - p++; - } - return 0; -} - -//--------------------------------------------------------------------------------- -ssize_t con_write(UNUSED struct _reent *r,UNUSED int fd,const char *ptr, size_t len) { +ssize_t con_write(UNUSED struct _reent *r,UNUSED void *fd,const char *ptr, size_t len) { //--------------------------------------------------------------------------------- char chr; @@ -349,7 +336,7 @@ parameter = 0; if (escapelen == 1) { consumed = 1; - } else if (strnchr(escapeseq,';',escapelen)) { + } else if (memchr(escapeseq,';',escapelen)) { sscanf(escapeseq,"%d;%n", ¶meter, &consumed); } else { sscanf(escapeseq,"%dm%n", ¶meter, &consumed);