diff options
Diffstat (limited to 'src/sp_config_scanner.re')
| -rw-r--r-- | src/sp_config_scanner.re | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sp_config_scanner.re b/src/sp_config_scanner.re index 82359d6..8f0b24e 100644 --- a/src/sp_config_scanner.re +++ b/src/sp_config_scanner.re | |||
| @@ -197,8 +197,8 @@ zend_result sp_config_scan(const char *data, zend_result (*process_rule)(sp_pars | |||
| 197 | <init> end { ret = SUCCESS; goto out; } | 197 | <init> end { ret = SUCCESS; goto out; } |
| 198 | <init> "@"? "set" whitespace+ @t1 keyword @t2 whitespace+ @t3 string @t4 whitespace* ";" { | 198 | <init> "@"? "set" whitespace+ @t1 keyword @t2 whitespace+ @t3 string @t4 whitespace* ";" { |
| 199 | if (!cond_res[0]) { goto yyc_init; } | 199 | if (!cond_res[0]) { goto yyc_init; } |
| 200 | char *key = (char*)t1; | 200 | const char *key = t1; |
| 201 | int keylen = t2 - t1; | 201 | size_t keylen = t2 - t1; |
| 202 | zend_string *tmp = zend_hash_str_find_ptr(&vars, key, keylen); | 202 | zend_string *tmp = zend_hash_str_find_ptr(&vars, key, keylen); |
| 203 | if (tmp) { | 203 | if (tmp) { |
| 204 | zend_hash_str_del(&vars, key, keylen); | 204 | zend_hash_str_del(&vars, key, keylen); |
| @@ -304,9 +304,9 @@ zend_result sp_config_scan(const char *data, zend_result (*process_rule)(sp_pars | |||
| 304 | goto out; | 304 | goto out; |
| 305 | } | 305 | } |
| 306 | sp_parsed_keyword kw = { | 306 | sp_parsed_keyword kw = { |
| 307 | .kw = (char*)t1, | 307 | .kw = t1, |
| 308 | .kwlen = t2-t1, | 308 | .kwlen = t2-t1, |
| 309 | .arg = (char*)t3, | 309 | .arg = t3, |
| 310 | .arglen = t4-t3, | 310 | .arglen = t4-t3, |
| 311 | .argtype = SP_ARGTYPE_UNKNOWN, | 311 | .argtype = SP_ARGTYPE_UNKNOWN, |
| 312 | .lineno = lineno | 312 | .lineno = lineno |
| @@ -315,7 +315,7 @@ zend_result sp_config_scan(const char *data, zend_result (*process_rule)(sp_pars | |||
| 315 | if (t3 == t4) { | 315 | if (t3 == t4) { |
| 316 | kw.argtype = SP_ARGTYPE_EMPTY; | 316 | kw.argtype = SP_ARGTYPE_EMPTY; |
| 317 | } else if (t4-t3 >= 2 && *t3 == '"') { | 317 | } else if (t4-t3 >= 2 && *t3 == '"') { |
| 318 | kw.arg = (char*)t3 + 1; | 318 | kw.arg = t3 + 1; |
| 319 | kw.arglen = t4 - t3 - 2; | 319 | kw.arglen = t4 - t3 - 2; |
| 320 | kw.argtype = SP_ARGTYPE_STR; | 320 | kw.argtype = SP_ARGTYPE_STR; |
| 321 | } else { | 321 | } else { |
