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/standard/quot_print.c | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'ext/standard/quot_print.c')
| -rw-r--r-- | ext/standard/quot_print.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/quot_print.c b/ext/standard/quot_print.c index 1d13d56678..b2186b5ed1 100644 --- a/ext/standard/quot_print.c +++ b/ext/standard/quot_print.c @@ -96,7 +96,7 @@ PHPAPI zend_string *php_quot_print_decode(const unsigned char *str, size_t lengt i--; } - retval = STR_ALLOC(buf_size, 0); + retval = zend_string_alloc(buf_size, 0); i = length; p1 = str; p2 = (unsigned char*)retval->val; decoded_len = 0; @@ -147,12 +147,12 @@ PHPAPI zend_string *php_quot_print_decode(const unsigned char *str, size_t lengt PHPAPI zend_string *php_quot_print_encode(const unsigned char *str, size_t length) /* {{{ */ { - php_uint_t lp = 0; + zend_ulong lp = 0; unsigned char c, *d; char *hex = "0123456789ABCDEF"; zend_string *ret; - ret = STR_SAFE_ALLOC(3, (length + (((3 * length)/(PHP_QPRINT_MAXL-9)) + 1)), 0, 0); + ret = zend_string_safe_alloc(3, (length + (((3 * length)/(PHP_QPRINT_MAXL-9)) + 1)), 0, 0); d = (unsigned char*)ret->val; while (length--) { @@ -187,7 +187,7 @@ PHPAPI zend_string *php_quot_print_encode(const unsigned char *str, size_t lengt } } *d = '\0'; - ret = STR_REALLOC(ret, d - (unsigned char*)ret->val, 0); + ret = zend_string_realloc(ret, d - (unsigned char*)ret->val, 0); return ret; } /* }}} */ @@ -216,7 +216,7 @@ PHP_FUNCTION(quoted_printable_decode) } str_in = arg1->val; - str_out = STR_ALLOC(arg1->len, 0); + str_out = zend_string_alloc(arg1->len, 0); while (str_in[i]) { switch (str_in[i]) { case '=': |