sniper Mon Dec 5 20:26:39 2005 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
nuke php3 legacy
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.228&r2=1.229&ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.228
php-src/ext/mbstring/mbstring.c:1.229
--- php-src/ext/mbstring/mbstring.c:1.228 Wed Nov 23 10:16:39 2005
+++ php-src/ext/mbstring/mbstring.c Mon Dec 5 20:26:39 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.228 2005/11/23 15:16:39 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.229 2005/12/06 01:26:39 sniper Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -181,7 +181,7 @@
/* }}} */
/* {{{ function_entry mbstring_functions[] */
-function_entry mbstring_functions[] = {
+zval_function_entry mbstring_functions[] = {
PHP_FE(mb_convert_case, NULL)
PHP_FE(mb_strtoupper, NULL)
PHP_FE(mb_strtolower, NULL)
@@ -1776,7 +1776,7 @@
Returns part of a string */
PHP_FUNCTION(mb_strcut)
{
- pval **arg1, **arg2, **arg3, **arg4;
+ zval **arg1, **arg2, **arg3, **arg4;
int argc, from, len;
mbfl_string string, result, *ret;
@@ -1892,7 +1892,7 @@
Trim the string in terminal width */
PHP_FUNCTION(mb_strimwidth)
{
- pval **arg1, **arg2, **arg3, **arg4, **arg5;
+ zval **arg1, **arg2, **arg3, **arg4, **arg5;
int from, width;
mbfl_string string, result, marker, *ret;
@@ -2054,7 +2054,7 @@
Returns converted string in desired encoding */
PHP_FUNCTION(mb_convert_encoding)
{
- pval **arg_str, **arg_new, **arg_old;
+ zval **arg_str, **arg_new, **arg_old;
int i;
size_t size, l, n;
char *_from_encodings, *ret, *s_free = NULL;
@@ -2198,7 +2198,7 @@
Encodings of the given string is returned (as a string) */
PHP_FUNCTION(mb_detect_encoding)
{
- pval **arg_str, **arg_list, **arg_strict;
+ zval **arg_str, **arg_list, **arg_strict;
mbfl_string string;
const char *ret;
enum mbfl_no_encoding *elist;
@@ -2484,7 +2484,7 @@
Converts the string resource in variables to desired encoding */
PHP_FUNCTION(mb_convert_variables)
{
- pval ***args, ***stack, **var, **hash_entry;
+ zval ***args, ***stack, **var, **hash_entry;
HashTable *target_hash;
mbfl_string string, result, *ret;
enum mbfl_no_encoding from_encoding, to_encoding;
@@ -2499,7 +2499,7 @@
if (argc < 3) {
WRONG_PARAM_COUNT;
}
- args = (pval ***)ecalloc(argc, sizeof(pval **));
+ args = (zval ***)ecalloc(argc, sizeof(zval **));
if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
efree((void *)args);
WRONG_PARAM_COUNT;
@@ -2541,7 +2541,7 @@
/* auto detect */
from_encoding = mbfl_no_encoding_invalid;
stack_max = PHP_MBSTR_STACK_BLOCK_SIZE;
- stack = (pval ***)safe_emalloc(stack_max, sizeof(pval **), 0);
+ stack = (zval ***)safe_emalloc(stack_max, sizeof(zval **), 0);
stack_level = 0;
identd = mbfl_encoding_detector_new(elist, elistsz);
if (identd != NULL) {
@@ -2567,8 +2567,8 @@
if
(Z_TYPE_PP(hash_entry) == IS_ARRAY || Z_TYPE_PP(hash_entry) == IS_OBJECT) {
if (stack_level
>= stack_max) {
stack_max += PHP_MBSTR_STACK_BLOCK_SIZE;
- ptmp =
erealloc(stack, sizeof(pval **)*stack_max);
- stack =
(pval ***)ptmp;
+ ptmp =
erealloc(stack, sizeof(zval **)*stack_max);
+ stack =
(zval ***)ptmp;
}
stack[stack_level] = var;
stack_level++;
@@ -2624,7 +2624,7 @@
/* convert */
if (convd != NULL) {
stack_max = PHP_MBSTR_STACK_BLOCK_SIZE;
- stack = (pval ***)safe_emalloc(stack_max, sizeof(pval **), 0);
+ stack = (zval ***)safe_emalloc(stack_max, sizeof(zval **), 0);
stack_level = 0;
n = 2;
while (n < argc || stack_level > 0) {
@@ -2648,8 +2648,8 @@
if (Z_TYPE_PP(hash_entry) ==
IS_ARRAY || Z_TYPE_PP(hash_entry) == IS_OBJECT) {
if (stack_level >=
stack_max) {
stack_max +=
PHP_MBSTR_STACK_BLOCK_SIZE;
- ptmp =
erealloc(stack, sizeof(pval **)*stack_max);
- stack = (pval
***)ptmp;
+ ptmp =
erealloc(stack, sizeof(zval **)*stack_max);
+ stack = (zval
***)ptmp;
}
stack[stack_level] =
var;
stack_level++;
@@ -2707,7 +2707,7 @@
static void
php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
{
- pval **arg1, **arg2, **arg3, **hash_entry;
+ zval **arg1, **arg2, **arg3, **hash_entry;
HashTable *target_hash;
int argc, i, *convmap, *mapelm, mapsize=0;
mbfl_string string, result, *ret;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
