cvs: php4 /ext/standard url_scanner_ex.c url_scanner_ex.re

sas Tue Sep 19 12:18:41 2000 EDT Modified files: /php4/ext/standard url_scanner_ex.re url_scanner_ex.c Log: Revert part of last commit. I'll refine it later. Index: php4/ext/standard/url_scanner_ex.re diff -u php4/ext/standard/url_scanner_ex.re:1.5 php4/ext/standard/url_scanner_ex.re:1.6 --- php4/ext/standard/url_scanner_ex.re:1.5 Tue Sep 19 11:17:28 2000 +++ php4/ext/standard/url_scanner_ex.re Tue Sep 19 12:18:41 2000 @@ -253,7 +253,7 @@ char *p; for (p = start; isalpha(*p); p++); - smart_str_setl(&ctx->arg, start, p - start); + smart_str_copyl(&ctx->arg, start, p - start); #ifdef SCANNER_DEBUG printf("ARG(%s)\n", ctx->arg.c); #endif @@ -274,7 +274,7 @@ ["] (all\[^>"])* ["] [ >] { YYCURSOR--; para_start = NULL; - smart_str_setl(&ctx->para, start + 1, YYCURSOR - start - 2); + smart_str_copyl(&ctx->para, start + 1, YYCURSOR - start - 2); #ifdef SCANNER_DEBUG printf("PARA(%s)\n", ctx->para.c); #endif @@ -286,7 +286,7 @@ (all\[^> ])+ [ >] { YYCURSOR--; para_start = NULL; - smart_str_setl(&ctx->para, start, YYCURSOR - start); + smart_str_copyl(&ctx->para, start, YYCURSOR - start); #ifdef SCANNER_DEBUG printf("PARA(%s)\n", ctx->para.c); #endif @@ -377,6 +377,9 @@ smart_str_free(&BG(url_adapt_state).result); smart_str_free(&BG(url_adapt_state).work); + smart_str_free(&BG(url_adapt_state).tag); + smart_str_free(&BG(url_adapt_state).arg); + smart_str_free(&BG(url_adapt_state).para); return SUCCESS; } Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.5 php4/ext/standard/url_scanner_ex.c:1.6 --- php4/ext/standard/url_scanner_ex.c:1.5 Tue Sep 19 11:17:28 2000 +++ php4/ext/standard/url_scanner_ex.c Tue Sep 19 12:18:41 2000 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.5 on Tue Sep 19 20:15:55 2000 */ +/* Generated by re2c 0.5 on Tue Sep 19 21:17:19 2000 */ #line 1 "/home/sas/src/php4/ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ @@ -516,7 +516,7 @@ char *p; for (p = start; isalpha(*p); p++); - smart_str_setl(&ctx->arg, start, p - start); + smart_str_copyl(&ctx->arg, start, p - start); #ifdef SCANNER_DEBUG printf("ARG(%s)\n", ctx->arg.c); #endif @@ -606,7 +606,7 @@ { YYCURSOR--; para_start = NULL; - smart_str_setl(&ctx->para, start, YYCURSOR - start); + smart_str_copyl(&ctx->para, start, YYCURSOR - start); #ifdef SCANNER_DEBUG printf("PARA(%s)\n", ctx->para.c); #endif @@ -647,7 +647,7 @@ { YYCURSOR--; para_start = NULL; - smart_str_setl(&ctx->para, start + 1, YYCURSOR - start - 2); + smart_str_copyl(&ctx->para, start + 1, YYCURSOR - start - 2); #ifdef SCANNER_DEBUG printf("PARA(%s)\n", ctx->para.c); #endif @@ -747,6 +747,9 @@ smart_str_free(&BG(url_adapt_state).result); smart_str_free(&BG(url_adapt_state).work); + smart_str_free(&BG(url_adapt_state).tag); + smart_str_free(&BG(url_adapt_state).arg); + smart_str_free(&BG(url_adapt_state).para); return SUCCESS; }