fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't mix declarations and code (and one ** to *[])

Browse Source
This commit is contained in:
Evan Gates 2015-03-05 17:20:40 -08:00 committed by sin
parent 90751ab4ba
commit 07c4f784a6
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
expr.c
View File

@ -64,7 +64,8 @@ match(Val vstr, Val vregx)
{ {
regex_t re; regex_t re;
regmatch_t matches[2]; regmatch_t matches[2];
char buf1[intlen], buf2[intlen]; intmax_t d;
char *s, *p, buf1[intlen], buf2[intlen];
char *str = valstr(vstr, buf1, sizeof(buf1)); char *str = valstr(vstr, buf1, sizeof(buf1));
char *regx = valstr(vregx, buf2, sizeof(buf2));; char *regx = valstr(vregx, buf2, sizeof(buf2));;
char anchreg[strlen(regx) + 2]; char anchreg[strlen(regx) + 2];
@ -79,9 +80,9 @@ match(Val vstr, Val vregx)
} }
if (re.re_nsub) { if (re.re_nsub) {
intmax_t d;
char *s = str + matches[1].rm_so, *p = str + matches[1].rm_eo;
regfree(&re); regfree(&re);
s = str + matches[1].rm_so;
p = str + matches[1].rm_eo;
*p = '\0'; *p = '\0';
d = strtoimax(s, &p, 10); d = strtoimax(s, &p, 10);
@ -193,11 +194,11 @@ lex(char *s, Val *v)
* ops is the operator stack, opp points to one past last op on the stack * ops is the operator stack, opp points to one past last op on the stack
*/ */
static int static int
parse(char **expr, int exprlen) parse(char *expr[], int exprlen)
{ {
Val vals[exprlen], *valp = vals; Val vals[exprlen], *valp = vals, v;
int ops[exprlen], *opp = ops; int ops[exprlen], *opp = ops;
int i, lasttype = 0; int i, type, lasttype = 0;
char prec[] = { /* precedence of operators */ char prec[] = { /* precedence of operators */
['|'] = 1, ['|'] = 1,
['&'] = 2, ['&'] = 2,
@ -208,10 +209,7 @@ parse(char **expr, int exprlen)
}; };
for (i = 0; i < exprlen; i++) { for (i = 0; i < exprlen; i++) {
Val v; switch ((type = lex(expr[i], &v))) {
int type = lex(expr[i], &v);
switch (type) {
case VAL: case VAL:
*valp++ = v; *valp++ = v;
break; break;