summaryrefslogtreecommitdiffstats
path: root/libc/regex/engine.c
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2010-06-16 16:36:41 -0700
committerDavid 'Digit' Turner <digit@google.com>2010-06-22 17:51:41 -0700
commit50ace4fec5e8cb5afcbc656a4556fa528adfd760 (patch)
tree04647e039a457f69ba48a8301bebdd605fda7fca /libc/regex/engine.c
parent6a9b888d7c4b246f6f66360789c72b754ff85021 (diff)
downloadbionic-50ace4fec5e8cb5afcbc656a4556fa528adfd760.zip
bionic-50ace4fec5e8cb5afcbc656a4556fa528adfd760.tar.gz
bionic-50ace4fec5e8cb5afcbc656a4556fa528adfd760.tar.bz2
Remove compiler warnings when building Bionic.
Also add missing declarations to misc. functions. Fix clearerr() implementation (previous was broken). Handle feature test macros like _POSIX_C_SOURCE properly. Change-Id: Icdc973a6b9d550a166fc2545f727ea837fe800c4
Diffstat (limited to 'libc/regex/engine.c')
-rw-r--r--libc/regex/engine.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/regex/engine.c b/libc/regex/engine.c
index 66be3c7..eae6ff2 100644
--- a/libc/regex/engine.c
+++ b/libc/regex/engine.c
@@ -209,7 +209,7 @@ matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[],
STATETEARDOWN(m);
return(REG_ESPACE);
}
- for (i = 1; i <= m->g->nsub; i++)
+ for (i = 1; i <= (int)m->g->nsub; i++)
m->pmatch[i].rm_so = m->pmatch[i].rm_eo = -1;
if (!g->backrefs && !(m->eflags&REG_BACKR)) {
NOTE("dissecting");
@@ -267,8 +267,8 @@ matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[],
}
if (nmatch > 1) {
assert(m->pmatch != NULL);
- for (i = 1; i < nmatch; i++)
- if (i <= m->g->nsub)
+ for (i = 1; i < (ssize_t)nmatch; i++)
+ if (i <= (int)m->g->nsub)
pmatch[i] = m->pmatch[i];
else {
pmatch[i].rm_so = -1;