subject:"\[PHP\-CVS\] cvs\: php\-src \/ext\/mbstring mbstring.c php

[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c php_mbregex.h

2008-07-17 Thread Moriyoshi Koizumi

moriyoshi   Thu Jul 17 20:03:50 2008 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c php_mbregex.h 
  Log:
  - Fix ZTS build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.285&r2=1.286&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.285 
php-src/ext/mbstring/mbstring.c:1.286
--- php-src/ext/mbstring/mbstring.c:1.285   Thu Jul 17 16:08:08 2008
+++ php-src/ext/mbstring/mbstring.c Thu Jul 17 20:03:50 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.285 2008/07/17 16:08:08 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.286 2008/07/17 20:03:50 moriyoshi Exp $ */
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -1013,12 +1013,12 @@
 #if HAVE_MBREGEX
{
const char *enc_name = new_value;
-   if (FAILURE == 
php_mb_regex_set_default_mbctype(enc_name)) {
+   if (FAILURE == 
php_mb_regex_set_default_mbctype(enc_name TSRMLS_CC)) {
/* falls back to EUC-JP if an unknown encoding 
name is given */
enc_name = "EUC-JP";
-   php_mb_regex_set_default_mbctype(enc_name);
+   php_mb_regex_set_default_mbctype(enc_name 
TSRMLS_CC);
}
-   php_mb_regex_set_mbctype(new_value);
+   php_mb_regex_set_mbctype(new_value TSRMLS_CC);
}
 #endif
 #ifdef ZEND_MULTIBYTE
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.h?r1=1.18&r2=1.19&diff_format=u
Index: php-src/ext/mbstring/php_mbregex.h
diff -u php-src/ext/mbstring/php_mbregex.h:1.18 
php-src/ext/mbstring/php_mbregex.h:1.19
--- php-src/ext/mbstring/php_mbregex.h:1.18 Thu Jul 17 16:08:08 2008
+++ php-src/ext/mbstring/php_mbregex.h  Thu Jul 17 20:03:50 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mbregex.h,v 1.18 2008/07/17 16:08:08 moriyoshi Exp $ */
+/* $Id: php_mbregex.h,v 1.19 2008/07/17 20:03:50 moriyoshi Exp $ */
  
 #ifndef _PHP_MBREGEX_H
 #define _PHP_MBREGEX_H
@@ -69,7 +69,7 @@
 
 typedef struct _zend_mb_regex_globals zend_mb_regex_globals;
 
-zend_mb_regex_globals *php_mb_regex_globals_new(TSRMLS_D);
+zend_mb_regex_globals *php_mb_regex_globals_alloc(TSRMLS_D);
 void php_mb_regex_globals_free(zend_mb_regex_globals *pglobals TSRMLS_DC);
 int php_mb_regex_set_mbctype(const char *enc TSRMLS_DC);
 int php_mb_regex_set_default_mbctype(const char *encname TSRMLS_DC);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c php_mbregex.h

2008-07-07 Thread Felipe Pena

felipe  Mon Jul  7 13:52:44 2008 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c php_mbregex.h 
  Log:
  MFB:
  - Added arginfo
  - Removed unnecessary #include "zend_arg_defs.c"
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.280&r2=1.281&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.280 
php-src/ext/mbstring/mbstring.c:1.281
--- php-src/ext/mbstring/mbstring.c:1.280   Mon Jul  7 10:00:30 2008
+++ php-src/ext/mbstring/mbstring.c Mon Jul  7 13:52:44 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.280 2008/07/07 10:00:30 indeyets Exp $ */
+/* $Id: mbstring.c,v 1.281 2008/07/07 13:52:44 felipe Exp $ */
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -163,32 +163,6 @@
 
 /* }}} */
 
-static
-   ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_parse_str_arginfo, 0, 0, 1)
-   ZEND_ARG_INFO(0, encoded_string)
-   ZEND_ARG_ARRAY_INFO(1, result, 1)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_convert_variables_arginfo, 1, 0, 3)
-   ZEND_ARG_INFO(0, to_encoding)
-   ZEND_ARG_INFO(0, from_encoding)
-   ZEND_ARG_INFO(1, vars)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_ereg_arginfo, 0, 0, 2)
-   ZEND_ARG_INFO(0, pattern)
-   ZEND_ARG_INFO(0, string)
-   ZEND_ARG_INFO(1, regs)
-   ZEND_END_ARG_INFO()
-
 /* {{{ mb_overload_def mb_ovld[] */
 static const struct mb_overload_def mb_ovld[] = {
{MB_OVERLOAD_MAIL, "mail", "mb_send_mail", "mb_orig_mail"},
@@ -215,48 +189,406 @@
 }; 
 /* }}} */
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_language, 0, 0, 0)
+   ZEND_ARG_INFO(0, language)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_internal_encoding, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_input, 0, 0, 0)
+   ZEND_ARG_INFO(0, type)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_output, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_detect_order, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substitute_character, 0, 0, 0)
+   ZEND_ARG_INFO(0, substchar)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_preferred_mime_name, 0, 0, 1)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_parse_str, 0, 0, 1)
+   ZEND_ARG_INFO(0, encoded_string)
+   ZEND_ARG_INFO(1, result)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_output_handler, 0, 0, 2)
+   ZEND_ARG_INFO(0, contents)
+   ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strlen, 0, 0, 1)
+   ZEND_ARG_INFO(0, str)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strpos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrpos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stripos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strripos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strstr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrchr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stristr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrichr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_

[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c php_mbregex.h

2003-08-03 Thread Marcus Boerger

helly   Sun Aug  3 14:46:34 2003 EDT

  Modified files:  
/php-src/ext/mbstring   mbstring.c php_mbregex.h 
  Log:
  Reallow build
  
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.180 php-src/ext/mbstring/mbstring.c:1.181
--- php-src/ext/mbstring/mbstring.c:1.180   Sun Aug  3 13:44:36 2003
+++ php-src/ext/mbstring/mbstring.c Sun Aug  3 14:46:34 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.180 2003/08/03 17:44:36 zeev Exp $ */
+/* $Id: mbstring.c,v 1.181 2003/08/03 18:46:34 helly Exp $ */
 
 /*
  * PHP4 Multibyte String module "mbstring"
@@ -197,7 +197,7 @@
PHP_FE(mb_http_output,  NULL)
PHP_FE(mb_detect_order, NULL)
PHP_FE(mb_substitute_character, NULL)
-   PHP_FE(mb_parse_str,(unsigned char *)second_arg_force_ref)
+   PHP_FE(mb_parse_str,second_arg_force_ref)
PHP_FE(mb_output_handler,   NULL)
PHP_FE(mb_preferred_mime_name,  NULL)
PHP_FE(mb_strlen,   NULL)
@@ -213,7 +213,7 @@
PHP_FE(mb_convert_kana, NULL)
PHP_FE(mb_encode_mimeheader,NULL)
PHP_FE(mb_decode_mimeheader,NULL)
-   PHP_FE(mb_convert_variables,(unsigned char *)third_and_rest_force_ref)
+   PHP_FE(mb_convert_variables,third_and_rest_force_ref)
PHP_FE(mb_encode_numericentity, NULL)
PHP_FE(mb_decode_numericentity, NULL)
PHP_FE(mb_send_mail,NULL)
Index: php-src/ext/mbstring/php_mbregex.h
diff -u php-src/ext/mbstring/php_mbregex.h:1.7 php-src/ext/mbstring/php_mbregex.h:1.8
--- php-src/ext/mbstring/php_mbregex.h:1.7  Tue Jun 10 16:03:31 2003
+++ php-src/ext/mbstring/php_mbregex.h  Sun Aug  3 14:46:34 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mbregex.h,v 1.7 2003/06/10 20:03:31 imajes Exp $ */
+/* $Id: php_mbregex.h,v 1.8 2003/08/03 18:46:34 helly Exp $ */
  
 #ifndef _PHP_MBREGEX_H
 #define _PHP_MBREGEX_H
@@ -44,8 +44,8 @@
 #define PHP_MBREGEX_FUNCTION_ENTRIES \
PHP_FE(mb_regex_encoding,   NULL) \
PHP_FE(mb_regex_set_options,NULL) \
-   PHP_FE(mb_ereg, (unsigned char *)third_argument_force_ref) \
-   PHP_FE(mb_eregi,(unsigned char 
*)third_argument_force_ref) \
+   PHP_FE(mb_ereg, third_arg_force_ref) \
+   PHP_FE(mb_eregi,third_arg_force_ref) \
PHP_FE(mb_ereg_replace, NULL) \
PHP_FE(mb_eregi_replace,NULL) \
PHP_FE(mb_split,NULL) \



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c php_mbregex.h

[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c php_mbregex.h

[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c php_mbregex.h

3 matches

Site Navigation

Mail list logo

Footer information