Fossil SCM
Fixed 2 string pointer type warnings reported on the mailing list.
Commit
46af6b826085024396d254f1919de556c0d68711
Parent
6a26eb349743852…
1 file changed
+2
-2
+2
-2
| --- src/regexp.c | ||
| +++ src/regexp.c | ||
| @@ -191,11 +191,11 @@ | ||
| 191 | 191 | int rc = 0; |
| 192 | 192 | ReInput in; |
| 193 | 193 | |
| 194 | 194 | in.z = zIn; |
| 195 | 195 | in.i = 0; |
| 196 | - in.mx = nIn>=0 ? nIn : strlen(zIn); | |
| 196 | + in.mx = nIn>=0 ? nIn : strlen((char const*)zIn); | |
| 197 | 197 | if( pRe->nInit ){ |
| 198 | 198 | unsigned char x = pRe->zInit[0]; |
| 199 | 199 | while( in.i+pRe->nInit<in.mx |
| 200 | 200 | && (zIn[in.i]!=x || memcmp(zIn+in.i, pRe->zInit, pRe->nInit)!=0) |
| 201 | 201 | ){ |
| @@ -626,11 +626,11 @@ | ||
| 626 | 626 | }else{ |
| 627 | 627 | re_append(pRe, RE_OP_ANYSTAR, 0); |
| 628 | 628 | } |
| 629 | 629 | pRe->sIn.z = (unsigned char*)zIn; |
| 630 | 630 | pRe->sIn.i = 0; |
| 631 | - pRe->sIn.mx = strlen(pRe->sIn.z); | |
| 631 | + pRe->sIn.mx = strlen(zIn); | |
| 632 | 632 | zErr = re_subcompile_re(pRe); |
| 633 | 633 | if( zErr ){ |
| 634 | 634 | re_free(pRe); |
| 635 | 635 | return zErr; |
| 636 | 636 | } |
| 637 | 637 |
| --- src/regexp.c | |
| +++ src/regexp.c | |
| @@ -191,11 +191,11 @@ | |
| 191 | int rc = 0; |
| 192 | ReInput in; |
| 193 | |
| 194 | in.z = zIn; |
| 195 | in.i = 0; |
| 196 | in.mx = nIn>=0 ? nIn : strlen(zIn); |
| 197 | if( pRe->nInit ){ |
| 198 | unsigned char x = pRe->zInit[0]; |
| 199 | while( in.i+pRe->nInit<in.mx |
| 200 | && (zIn[in.i]!=x || memcmp(zIn+in.i, pRe->zInit, pRe->nInit)!=0) |
| 201 | ){ |
| @@ -626,11 +626,11 @@ | |
| 626 | }else{ |
| 627 | re_append(pRe, RE_OP_ANYSTAR, 0); |
| 628 | } |
| 629 | pRe->sIn.z = (unsigned char*)zIn; |
| 630 | pRe->sIn.i = 0; |
| 631 | pRe->sIn.mx = strlen(pRe->sIn.z); |
| 632 | zErr = re_subcompile_re(pRe); |
| 633 | if( zErr ){ |
| 634 | re_free(pRe); |
| 635 | return zErr; |
| 636 | } |
| 637 |
| --- src/regexp.c | |
| +++ src/regexp.c | |
| @@ -191,11 +191,11 @@ | |
| 191 | int rc = 0; |
| 192 | ReInput in; |
| 193 | |
| 194 | in.z = zIn; |
| 195 | in.i = 0; |
| 196 | in.mx = nIn>=0 ? nIn : strlen((char const*)zIn); |
| 197 | if( pRe->nInit ){ |
| 198 | unsigned char x = pRe->zInit[0]; |
| 199 | while( in.i+pRe->nInit<in.mx |
| 200 | && (zIn[in.i]!=x || memcmp(zIn+in.i, pRe->zInit, pRe->nInit)!=0) |
| 201 | ){ |
| @@ -626,11 +626,11 @@ | |
| 626 | }else{ |
| 627 | re_append(pRe, RE_OP_ANYSTAR, 0); |
| 628 | } |
| 629 | pRe->sIn.z = (unsigned char*)zIn; |
| 630 | pRe->sIn.i = 0; |
| 631 | pRe->sIn.mx = strlen(zIn); |
| 632 | zErr = re_subcompile_re(pRe); |
| 633 | if( zErr ){ |
| 634 | re_free(pRe); |
| 635 | return zErr; |
| 636 | } |
| 637 |