diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
| commit | c3e3c98ec666812daaaca896cf5ef758a8a6df14 (patch) | |
| tree | d82a76de5c8d117d1cf2dcca19bb30a283621870 /ext/readline/readline_cli.c | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'ext/readline/readline_cli.c')
| -rw-r--r-- | ext/readline/readline_cli.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c index 0ca9daf8ff..2279f7aaa1 100644 --- a/ext/readline/readline_cli.c +++ b/ext/readline/readline_cli.c @@ -530,10 +530,10 @@ TODO: class_name_end = strstr(text, "::"); if (class_name_end) { class_name_len = class_name_end - text; - class_name = STR_ALLOC(class_name_len, 0); + class_name = zend_string_alloc(class_name_len, 0); zend_str_tolower_copy(class_name->val, text, class_name_len); if ((ce = zend_lookup_class(class_name TSRMLS_CC)) == NULL) { - STR_RELEASE(class_name); + zend_string_release(class_name); return NULL; } lc_text = zend_str_tolower_dup(class_name_end + 2, textlen - 2 - class_name_len); @@ -564,7 +564,7 @@ TODO: } efree(lc_text); if (class_name_end) { - STR_RELEASE(class_name); + zend_string_release(class_name); } if (ce && retval) { int len = class_name_len + 2 + strlen(retval) + 1; @@ -631,13 +631,13 @@ static int readline_shell_run(TSRMLS_D) /* {{{ */ if (param) { zend_string *cmd; param++; - cmd = STR_INIT(&line[1], param - &line[1] - 1, 0); + cmd = zend_string_init(&line[1], param - &line[1] - 1, 0); zend_alter_ini_entry_ex(cmd, param, strlen(param), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC); - STR_RELEASE(cmd); + zend_string_release(cmd); add_history(line); - STR_RELEASE(prompt); + zend_string_release(prompt); /* TODO: This might be wrong! */ prompt = cli_get_prompt("php", '>' TSRMLS_CC); continue; @@ -659,7 +659,7 @@ static int readline_shell_run(TSRMLS_D) /* {{{ */ } free(line); - STR_RELEASE(prompt); + zend_string_release(prompt); if (!cli_is_valid_code(code, pos, &prompt TSRMLS_CC)) { continue; @@ -697,7 +697,7 @@ static int readline_shell_run(TSRMLS_D) /* {{{ */ } free(history_file); efree(code); - STR_RELEASE(prompt); + zend_string_release(prompt); return EG(exit_status); } /* }}} */ |