diff options
Diffstat (limited to 'src/backend/regex')
| -rw-r--r-- | src/backend/regex/regcomp.c | 10 | ||||
| -rw-r--r-- | src/backend/regex/regerror.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index af6bede84bc..364573e2b5b 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -236,7 +236,7 @@ int cflags; g->nsub = 0; g->ncategories = 1; /* category 0 is "everything else" */ g->categories = &g->catspace[-(CHAR_MIN)]; - (void) memset((char *)g->catspace, 0, NC*sizeof(cat_t)); + memset((char *)g->catspace, 0, NC*sizeof(cat_t)); g->backrefs = 0; /* do it */ @@ -596,7 +596,7 @@ int starordinary; /* is a leading * an ordinary character? */ assert(p->pbegin[i] != 0); assert(OP(p->strip[p->pbegin[i]]) == OLPAREN); assert(OP(p->strip[p->pend[i]]) == ORPAREN); - (void) dupl(p, p->pbegin[i]+1, p->pend[i]); + dupl(p, p->pbegin[i]+1, p->pend[i]); EMIT(O_BACK, i); } else SETERROR(REG_ESUBREG); @@ -1115,7 +1115,7 @@ register struct parse *p; p->g->sets[i].ptr = p->g->setbits + css*(i/CHAR_BIT); } if (p->g->sets != NULL && p->g->setbits != NULL) - (void) memset((char *)p->g->setbits + (nbytes - css), + memset((char *)p->g->setbits + (nbytes - css), 0, css); else { no = 0; @@ -1273,7 +1273,7 @@ register char *cp; register size_t len = strlen(fp); assert(fp != NULL); - (void) memmove(fp, fp + len + 1, + memmove(fp, fp + len + 1, cs->smultis - (fp + len + 1 - cs->multis)); cs->smultis -= len; @@ -1440,7 +1440,7 @@ sopno finish; /* to this less one */ return(ret); enlarge(p, p->ssize + len); /* this many unexpected additions */ assert(p->ssize >= p->slen + len); - (void) memcpy((char *)(p->strip + p->slen), + memcpy((char *)(p->strip + p->slen), (char *)(p->strip + start), (size_t)len*sizeof(sop)); p->slen += len; return(ret); diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index 536f70ceb8d..7d1d06cbc90 100644 --- a/src/backend/regex/regerror.c +++ b/src/backend/regex/regerror.c @@ -135,7 +135,7 @@ size_t errbuf_size; if (errcode®_ITOA) { if (r->code != 0) - (void) strcpy(convbuf, r->name); + strcpy(convbuf, r->name); else sprintf(convbuf, "REG_0x%x", target); assert(strlen(convbuf) < sizeof(convbuf)); @@ -147,9 +147,9 @@ size_t errbuf_size; len = strlen(s) + 1; if (errbuf_size > 0) { if (errbuf_size > len) - (void) strcpy(errbuf, s); + strcpy(errbuf, s); else { - (void) strncpy(errbuf, s, errbuf_size-1); + strncpy(errbuf, s, errbuf_size-1); errbuf[errbuf_size-1] = '\0'; } } |