archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move smart_str implementation into Zend/

Browse source 
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
This commit is contained in:
Nikita Popov 2014-09-20 22:42:02 +02:00
parent e1fe5cb8c2
commit e33f3d3b7c
64 changed files with 69 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/standard/php_smart_str.h → Zend/zend_smart_str.h
View file

@ -16,15 +16,11 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
/* $Id$ */ #ifndef ZEND_SMART_STR_H
#define ZEND_SMART_STR_H
#ifndef PHP_SMART_STR_H
#define PHP_SMART_STR_H
#include "php_smart_str_public.h"
#include <stdlib.h>
#include <zend.h> #include <zend.h>
#include "zend_smart_str_public.h"
#ifndef SMART_STR_PREALLOC #ifndef SMART_STR_PREALLOC
#define SMART_STR_PREALLOC 128 #define SMART_STR_PREALLOC 128
@ -34,8 +30,6 @@
#define SMART_STR_START_SIZE 78 #define SMART_STR_START_SIZE 78
#endif #endif
/* wrapper */
#define smart_str_appends_ex(dest, src, what) \ #define smart_str_appends_ex(dest, src, what) \
smart_str_appendl_ex((dest), (src), strlen(src), (what)) smart_str_appendl_ex((dest), (src), strlen(src), (what))
#define smart_str_appends(dest, src) \ #define smart_str_appends(dest, src) \
@ -122,3 +116,4 @@ static zend_always_inline void smart_str_setl(smart_str *dest, const char *src,
} }
#endif #endif

8
ext/standard/php_smart_str_public.h → Zend/zend_smart_str_public.h
View file

@ -16,12 +16,8 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
/* $Id$ */ #ifndef ZEND_SMART_STR_PUBLIC_H
#define ZEND_SMART_STR_PUBLIC_H
#ifndef PHP_SMART_STR_PUBLIC_H
#define PHP_SMART_STR_PUBLIC_H
#include <sys/types.h>
typedef struct { typedef struct {
zend_string *s; zend_string *s;

2
ext/curl/interface.c
View file

@ -82,7 +82,7 @@
#define SMART_STR_PREALLOC 4096 #define SMART_STR_PREALLOC 4096
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/file.h" #include "ext/standard/file.h"
#include "ext/standard/url.h" #include "ext/standard/url.h"

2
ext/curl/php_curl.h
View file

@ -23,7 +23,7 @@
#define _PHP_CURL_H #define _PHP_CURL_H
#include "php.h" #include "php.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str_public.h"
#ifdef COMPILE_DL_CURL #ifdef COMPILE_DL_CURL
#undef HAVE_CURL #undef HAVE_CURL

2
ext/date/php_date.c
View file

@ -999,7 +999,7 @@ PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D)
/* {{{ date() and gmdate() data */ /* {{{ date() and gmdate() data */
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
static char *mon_full_names[] = { static char *mon_full_names[] = {
"January", "February", "March", "April", "January", "February", "March", "April",

2
ext/dba/dba.c
View file

@ -519,7 +519,7 @@ PHP_MSHUTDOWN_FUNCTION(dba)
} }
/* }}} */ /* }}} */
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION
*/ */

2
ext/filter/sanitizing_filters.c
View file

@ -20,7 +20,7 @@
#include "php_filter.h" #include "php_filter.h"
#include "filter_private.h" #include "filter_private.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
/* {{{ STRUCTS */ /* {{{ STRUCTS */
typedef unsigned long filter_map[256]; typedef unsigned long filter_map[256];

2
ext/gmp/gmp.c
View file

@ -25,7 +25,7 @@
#include "php_gmp.h" #include "php_gmp.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_var.h" #include "ext/standard/php_var.h"
#include "ext/standard/php_smart_str_public.h" #include "zend_smart_str_public.h"
#include "zend_exceptions.h" #include "zend_exceptions.h"
#if HAVE_GMP #if HAVE_GMP

2
ext/iconv/iconv.c
View file

@ -55,7 +55,7 @@
#undef iconv #undef iconv
#endif #endif
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/base64.h" #include "ext/standard/base64.h"
#include "ext/standard/quot_print.h" #include "ext/standard/quot_print.h"

2
ext/imap/php_imap.c
View file

@ -40,7 +40,7 @@
#include "ext/standard/php_string.h" #include "ext/standard/php_string.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/file.h" #include "ext/standard/file.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/pcre/php_pcre.h" #include "ext/pcre/php_pcre.h"
#ifdef ERROR #ifdef ERROR

2
ext/intl/intl_error.h
View file

@ -21,7 +21,7 @@
#include <unicode/utypes.h> #include <unicode/utypes.h>
#include <unicode/parseerr.h> #include <unicode/parseerr.h>
#include <ext/standard/php_smart_str.h> #include <zend_smart_str_public.h>
#define INTL_ERROR_CODE(e) (e).code #define INTL_ERROR_CODE(e) (e).code

2
ext/intl/locale/locale_methods.c
View file

@ -36,7 +36,7 @@
#include <zend.h> #include <zend.h>
#include <php.h> #include <php.h>
#include "main/php_ini.h" #include "main/php_ini.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
ZEND_EXTERN_MODULE_GLOBALS( intl ) ZEND_EXTERN_MODULE_GLOBALS( intl )

2
ext/intl/transliterator/transliterator.h
View file

@ -21,7 +21,7 @@
#include <unicode/utypes.h> #include <unicode/utypes.h>
#include <unicode/utrans.h> #include <unicode/utrans.h>
#include "ext/standard/php_smart_str.h" #include "zend_smart_str_public.h"
void transliterator_register_constants( INIT_FUNC_ARGS ); void transliterator_register_constants( INIT_FUNC_ARGS );
smart_str transliterator_parse_error_to_string( UParseError* pe ); smart_str transliterator_parse_error_to_string( UParseError* pe );

2
ext/json/JSON_parser.h
View file

@ -4,8 +4,8 @@
#define JSON_PARSER_H #define JSON_PARSER_H
#include "php.h" #include "php.h"
#include "ext/standard/php_smart_str.h"
#include "php_json.h" #include "php_json.h"
#include "zend_smart_str.h"
#define JSON_PARSER_DEFAULT_DEPTH 512 #define JSON_PARSER_DEFAULT_DEPTH 512

2
ext/json/json.c
View file

@ -26,7 +26,7 @@
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/html.h" #include "ext/standard/html.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "JSON_parser.h" #include "JSON_parser.h"
#include "php_json.h" #include "php_json.h"
#include <zend_exceptions.h> #include <zend_exceptions.h>

2
ext/json/php_json.h
View file

@ -22,7 +22,7 @@
#define PHP_JSON_H #define PHP_JSON_H
#define PHP_JSON_VERSION "1.2.1" #define PHP_JSON_VERSION "1.2.1"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str_public.h"
extern zend_module_entry json_module_entry; extern zend_module_entry json_module_entry;
#define phpext_json_ptr &json_module_entry #define phpext_json_ptr &json_module_entry

2
ext/libxml/php_libxml.h
View file

@ -34,7 +34,7 @@ extern zend_module_entry libxml_module_entry;
# define PHP_LIBXML_API # define PHP_LIBXML_API
#endif #endif
#include "ext/standard/php_smart_str.h" #include "zend_smart_str_public.h"
#include <libxml/tree.h> #include <libxml/tree.h>
#define LIBXML_SAVE_NOEMPTYTAG 1<<2 #define LIBXML_SAVE_NOEMPTYTAG 1<<2

2
ext/mbstring/php_mbregex.c
View file

@ -28,7 +28,7 @@
#if HAVE_MBREGEX #if HAVE_MBREGEX
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "php_mbregex.h" #include "php_mbregex.h"
#include "mbstring.h" #include "mbstring.h"

4
ext/mcrypt/mcrypt.c
View file

@ -40,7 +40,7 @@
#include "php_globals.h" #include "php_globals.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_rand.h" #include "ext/standard/php_rand.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "php_mcrypt_filter.h" #include "php_mcrypt_filter.h"
static int le_mcrypt; static int le_mcrypt;
@ -452,7 +452,7 @@ static PHP_MSHUTDOWN_FUNCTION(mcrypt) /* {{{ */
} }
/* }}} */ /* }}} */
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
PHP_MINFO_FUNCTION(mcrypt) /* {{{ */ PHP_MINFO_FUNCTION(mcrypt) /* {{{ */
{ {

2
ext/mysqli/mysqli_api.c
View file

@ -30,7 +30,7 @@
#include "php_ini.h" #include "php_ini.h"
#include "php_globals.h" #include "php_globals.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "php_mysqli_structs.h" #include "php_mysqli_structs.h"
#include "mysqli_priv.h" #include "mysqli_priv.h"

2
ext/mysqli/mysqli_nonapi.c
View file

@ -29,7 +29,7 @@
#include "php.h" #include "php.h"
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "php_mysqli_structs.h" #include "php_mysqli_structs.h"
#include "mysqli_priv.h" #include "mysqli_priv.h"

2
ext/mysqlnd/mysqlnd.c
View file

@ -27,7 +27,7 @@
#include "mysqlnd_statistics.h" #include "mysqlnd_statistics.h"
#include "mysqlnd_charset.h" #include "mysqlnd_charset.h"
#include "mysqlnd_debug.h" #include "mysqlnd_debug.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
/* /*
TODO : TODO :

2
ext/mysqlnd/mysqlnd_alloc.c
View file

@ -539,7 +539,7 @@ void _mysqlnd_free(void *ptr MYSQLND_MEM_D)
#define SMART_STR_START_SIZE 2048 #define SMART_STR_START_SIZE 2048
#define SMART_STR_PREALLOC 512 #define SMART_STR_PREALLOC 512
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
/* {{{ _mysqlnd_pestrndup */ /* {{{ _mysqlnd_pestrndup */

2
ext/mysqlnd/mysqlnd_structs.h
View file

@ -23,7 +23,7 @@
#ifndef MYSQLND_STRUCTS_H #ifndef MYSQLND_STRUCTS_H
#define MYSQLND_STRUCTS_H #define MYSQLND_STRUCTS_H
#include "ext/standard/php_smart_str_public.h" #include "zend_smart_str_public.h"
#define MYSQLND_TYPEDEFED_METHODS #define MYSQLND_TYPEDEFED_METHODS

2
ext/mysqlnd/php_mysqlnd.c
View file

@ -27,7 +27,7 @@
#include "mysqlnd_statistics.h" #include "mysqlnd_statistics.h"
#include "mysqlnd_reverse_api.h" #include "mysqlnd_reverse_api.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
/* {{{ mysqlnd_functions[] /* {{{ mysqlnd_functions[]
* *

2
ext/oci8/oci8.c
View file

@ -33,7 +33,7 @@
#include "php.h" #include "php.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#if HAVE_OCI8 #if HAVE_OCI8

2
ext/openssl/xp_ssl.c
View file

@ -28,7 +28,7 @@
#include "ext/standard/file.h" #include "ext/standard/file.h"
#include "ext/standard/url.h" #include "ext/standard/url.h"
#include "streams/php_streams_int.h" #include "streams/php_streams_int.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "php_openssl.h" #include "php_openssl.h"
#include "php_network.h" #include "php_network.h"
#include <openssl/ssl.h> #include <openssl/ssl.h>

2
ext/pcre/php_pcre.c
View file

@ -23,7 +23,7 @@
#include "php_globals.h" #include "php_globals.h"
#include "php_pcre.h" #include "php_pcre.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#if HAVE_PCRE || HAVE_BUNDLED_PCRE #if HAVE_PCRE || HAVE_BUNDLED_PCRE

2
ext/pgsql/pgsql.c
View file

@ -35,7 +35,7 @@
#include "php.h" #include "php.h"
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/php_standard.h" #include "ext/standard/php_standard.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/ereg/php_regex.h" #include "ext/ereg/php_regex.h"
#ifdef PHP_WIN32 #ifdef PHP_WIN32
# include "win32/time.h" # include "win32/time.h"

2
ext/phar/phar_internal.h
View file

@ -35,6 +35,7 @@
#include "zend_operators.h" #include "zend_operators.h"
#include "zend_qsort.h" #include "zend_qsort.h"
#include "zend_vm.h" #include "zend_vm.h"
#include "zend_smart_str.h"
#include "main/php_streams.h" #include "main/php_streams.h"
#include "main/streams/php_stream_plain_wrapper.h" #include "main/streams/php_stream_plain_wrapper.h"
#include "main/SAPI.h" #include "main/SAPI.h"
@ -49,7 +50,6 @@
#include "ext/standard/md5.h" #include "ext/standard/md5.h"
#include "ext/standard/sha1.h" #include "ext/standard/sha1.h"
#include "ext/standard/php_var.h" #include "ext/standard/php_var.h"
#include "ext/standard/php_smart_str.h"
#include "ext/standard/php_versioning.h" #include "ext/standard/php_versioning.h"
#ifndef PHP_WIN32 #ifndef PHP_WIN32
#include "TSRM/tsrm_strtok_r.h" #include "TSRM/tsrm_strtok_r.h"

2
ext/readline/readline_cli.c
View file

@ -42,7 +42,7 @@
#include "php_main.h" #include "php_main.h"
#include "fopen_wrappers.h" #include "fopen_wrappers.h"
#include "ext/standard/php_standard.h" #include "ext/standard/php_standard.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#ifdef __riscos__ #ifdef __riscos__
#include <unixlib/local.h> #include <unixlib/local.h>

2
ext/readline/readline_cli.h
View file

@ -20,7 +20,7 @@
/* $Id$ */ /* $Id$ */
#include "php.h" #include "php.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str_public.h"
ZEND_BEGIN_MODULE_GLOBALS(cli_readline) ZEND_BEGIN_MODULE_GLOBALS(cli_readline)
char *pager; char *pager;

2
ext/session/session.c
View file

@ -48,7 +48,7 @@
#include "ext/standard/url_scanner_ex.h" #include "ext/standard/url_scanner_ex.h"
#include "ext/standard/php_rand.h" /* for RAND_MAX */ #include "ext/standard/php_rand.h" /* for RAND_MAX */
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/url.h" #include "ext/standard/url.h"
#include "ext/standard/basic_functions.h" #include "ext/standard/basic_functions.h"
#include "ext/standard/head.h" #include "ext/standard/head.h"

2
ext/soap/php_soap.h
View file

@ -29,7 +29,7 @@
#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
#include "ext/session/php_session.h" #include "ext/session/php_session.h"
#endif #endif
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "php_ini.h" #include "php_ini.h"
#include "SAPI.h" #include "SAPI.h"
#include <libxml/parser.h> #include <libxml/parser.h>

2
ext/sockets/conversions.c
View file

@ -6,7 +6,7 @@
#endif #endif
#include <Zend/zend_llist.h> #include <Zend/zend_llist.h>
#include <ext/standard/php_smart_str.h> #include <zend_smart_str.h>
#ifndef PHP_WIN32 #ifndef PHP_WIN32
# include <sys/types.h> # include <sys/types.h>

2
ext/spl/spl_array.c
View file

@ -26,7 +26,7 @@
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_var.h" #include "ext/standard/php_var.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "zend_interfaces.h" #include "zend_interfaces.h"
#include "zend_exceptions.h" #include "zend_exceptions.h"

2
ext/spl/spl_dllist.c
View file

@ -29,7 +29,7 @@
#include "php_spl.h" #include "php_spl.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_var.h" #include "ext/standard/php_var.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "spl_functions.h" #include "spl_functions.h"
#include "spl_engine.h" #include "spl_engine.h"
#include "spl_iterators.h" #include "spl_iterators.h"

2
ext/spl/spl_iterators.c
View file

@ -35,7 +35,7 @@
#include "spl_directory.h" #include "spl_directory.h"
#include "spl_array.h" #include "spl_array.h"
#include "spl_exceptions.h" #include "spl_exceptions.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#ifdef accept #ifdef accept
#undef accept #undef accept

2
ext/spl/spl_observer.c
View file

@ -28,7 +28,7 @@
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_array.h" #include "ext/standard/php_array.h"
#include "ext/standard/php_var.h" #include "ext/standard/php_var.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "zend_interfaces.h" #include "zend_interfaces.h"
#include "zend_exceptions.h" #include "zend_exceptions.h"

2
ext/standard/array.c
View file

@ -45,7 +45,7 @@
#include "basic_functions.h" #include "basic_functions.h"
#include "php_string.h" #include "php_string.h"
#include "php_rand.h" #include "php_rand.h"
#include "php_smart_str.h" #include "zend_smart_str.h"
#ifdef HAVE_SPL #ifdef HAVE_SPL
#include "ext/spl/spl_array.h" #include "ext/spl/spl_array.h"
#endif #endif

2
ext/standard/file.c
View file

@ -35,7 +35,7 @@
#include "php_open_temporary_file.h" #include "php_open_temporary_file.h"
#include "ext/standard/basic_functions.h" #include "ext/standard/basic_functions.h"
#include "php_ini.h" #include "php_ini.h"
#include "php_smart_str.h" #include "zend_smart_str.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
ext/standard/filters.c
View file

@ -27,7 +27,7 @@
#include "ext/standard/basic_functions.h" #include "ext/standard/basic_functions.h"
#include "ext/standard/file.h" #include "ext/standard/file.h"
#include "ext/standard/php_string.h" #include "ext/standard/php_string.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
/* {{{ rot13 stream filter implementation */ /* {{{ rot13 stream filter implementation */
static char rot13_from[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; static char rot13_from[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";

2
ext/standard/http_fopen_wrapper.c
View file

@ -27,7 +27,7 @@
#include "php_network.h" #include "php_network.h"
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/basic_functions.h" #include "ext/standard/basic_functions.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
ext/standard/php_http.h
View file

@ -22,7 +22,7 @@
#define PHP_HTTP_H #define PHP_HTTP_H
#include "php.h" #include "php.h"
#include "php_smart_str.h" #include "zend_smart_str.h"
PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
const char *num_prefix, int num_prefix_len, const char *num_prefix, int num_prefix_len,

2
ext/standard/php_var.h
View file

@ -22,7 +22,7 @@
#define PHP_VAR_H #define PHP_VAR_H
#include "ext/standard/basic_functions.h" #include "ext/standard/basic_functions.h"
#include "ext/standard/php_smart_str_public.h" #include "zend_smart_str_public.h"
PHP_FUNCTION(var_dump); PHP_FUNCTION(var_dump);
PHP_FUNCTION(var_export); PHP_FUNCTION(var_export);

2
ext/standard/string.c
View file

@ -56,7 +56,7 @@
#include "zend_execute.h" #include "zend_execute.h"
#include "php_globals.h" #include "php_globals.h"
#include "basic_functions.h" #include "basic_functions.h"
#include "php_smart_str.h" #include "zend_smart_str.h"
#include <Zend/zend_exceptions.h> #include <Zend/zend_exceptions.h>
#ifdef ZTS #ifdef ZTS
#include "TSRM.h" #include "TSRM.h"

2
ext/standard/url_scanner_ex.c
View file

@ -42,7 +42,7 @@
#define url_scanner url_scanner_ex #define url_scanner url_scanner_ex
#include "php_smart_str.h" #include "zend_smart_str.h"
static void tag_dtor(zval *zv) static void tag_dtor(zval *zv)
{ {

2
ext/standard/url_scanner_ex.h
View file

@ -31,7 +31,7 @@ PHPAPI char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, co
PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC); PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC);
PHPAPI int php_url_scanner_reset_vars(TSRMLS_D); PHPAPI int php_url_scanner_reset_vars(TSRMLS_D);
#include "php_smart_str_public.h" #include "zend_smart_str_public.h"
typedef struct { typedef struct {
/* Used by the mainloop of the scanner */ /* Used by the mainloop of the scanner */

2
ext/standard/url_scanner_ex.re
View file

@ -40,7 +40,7 @@
#define url_scanner url_scanner_ex #define url_scanner url_scanner_ex
#include "php_smart_str.h" #include "zend_smart_str.h"
static void tag_dtor(zval *zv) static void tag_dtor(zval *zv)
{ {

2
ext/standard/var.c
View file

@ -28,7 +28,7 @@
#include "php.h" #include "php.h"
#include "php_string.h" #include "php_string.h"
#include "php_var.h" #include "php_var.h"
#include "php_smart_str.h" #include "zend_smart_str.h"
#include "basic_functions.h" #include "basic_functions.h"
#include "php_incomplete_class.h" #include "php_incomplete_class.h"

2
ext/sysvmsg/sysvmsg.c
View file

@ -27,7 +27,7 @@
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "php_sysvmsg.h" #include "php_sysvmsg.h"
#include "ext/standard/php_var.h" #include "ext/standard/php_var.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
/* In order to detect MSG_EXCEPT use at run time; we have no way /* In order to detect MSG_EXCEPT use at run time; we have no way
* of knowing what the bit definitions are, so we can't just define * of knowing what the bit definitions are, so we can't just define

2
ext/sysvshm/sysvshm.c
View file

@ -36,7 +36,7 @@
#include "php_sysvshm.h" #include "php_sysvshm.h"
#include "ext/standard/php_var.h" #include "ext/standard/php_var.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "php_ini.h" #include "php_ini.h"
/* {{{ arginfo */ /* {{{ arginfo */

2
ext/wddx/php_wddx_api.h
View file

@ -21,7 +21,7 @@
#ifndef PHP_WDDX_API_H #ifndef PHP_WDDX_API_H
#define PHP_WDDX_API_H #define PHP_WDDX_API_H
#include "ext/standard/php_smart_str.h" #include "zend_smart_str_public.h"
#define WDDX_ARRAY_S "<array length='%d'>" #define WDDX_ARRAY_S "<array length='%d'>"
#define WDDX_ARRAY_E "</array>" #define WDDX_ARRAY_E "</array>"

2
ext/wddx/wddx.c
View file

@ -35,7 +35,7 @@
#include "ext/standard/php_incomplete_class.h" #include "ext/standard/php_incomplete_class.h"
#include "ext/standard/base64.h" #include "ext/standard/base64.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/html.h" #include "ext/standard/html.h"
#include "ext/standard/php_string.h" #include "ext/standard/php_string.h"
#include "ext/date/php_date.h" #include "ext/date/php_date.h"

2
main/php_variables.c
View file

@ -23,7 +23,7 @@
#include "php.h" #include "php.h"
#include "ext/standard/php_standard.h" #include "ext/standard/php_standard.h"
#include "ext/standard/credits.h" #include "ext/standard/credits.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "php_variables.h" #include "php_variables.h"
#include "php_globals.h" #include "php_globals.h"
#include "php_content_types.h" #include "php_content_types.h"

2
main/spprintf.c
View file

@ -111,7 +111,7 @@
#define FLOAT_DIGITS 6 #define FLOAT_DIGITS 6
#define EXPONENT_LENGTH 10 #define EXPONENT_LENGTH 10
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/php_smart_string.h" #include "ext/standard/php_smart_string.h"
/* {{{ macros */ /* {{{ macros */

2
sapi/apache2filter/php_functions.c
View file

@ -22,7 +22,7 @@
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include "php.h" #include "php.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "SAPI.h" #include "SAPI.h"

2
sapi/apache2filter/sapi_apache2.c
View file

@ -30,7 +30,7 @@
#include "php_variables.h" #include "php_variables.h"
#include "SAPI.h" #include "SAPI.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#ifndef NETWARE #ifndef NETWARE
#include "ext/standard/php_standard.h" #include "ext/standard/php_standard.h"
#else #else

2
sapi/apache2handler/php_functions.c
View file

@ -21,7 +21,7 @@
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include "php.h" #include "php.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "ext/standard/head.h" #include "ext/standard/head.h"
#include "php_ini.h" #include "php_ini.h"

2
sapi/apache2handler/sapi_apache2.c
View file

@ -30,7 +30,7 @@
#include <fcntl.h> #include <fcntl.h>
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#ifndef NETWARE #ifndef NETWARE
#include "ext/standard/php_standard.h" #include "ext/standard/php_standard.h"
#else #else

2
sapi/cli/php_cli_server.c
View file

@ -96,7 +96,7 @@
#endif #endif
#include "ext/standard/file.h" /* for php_set_sock_blocking() :-( */ #include "ext/standard/file.h" /* for php_set_sock_blocking() :-( */
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "ext/standard/html.h" #include "ext/standard/html.h"
#include "ext/standard/url.h" /* for php_url_decode() */ #include "ext/standard/url.h" /* for php_url_decode() */
#include "ext/standard/php_string.h" /* for php_dirname() */ #include "ext/standard/php_string.h" /* for php_dirname() */

2
sapi/thttpd/thttpd.c
View file

@ -27,7 +27,7 @@
#include "php_ini.h" #include "php_ini.h"
#include "zend_highlight.h" #include "zend_highlight.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>

2
sapi/thttpd/thttpd_patch
View file

@ -240,7 +240,7 @@ diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
+ +
+#define SMART_STR_USE_REALLOC +#define SMART_STR_USE_REALLOC
+ +
+#include "ext/standard/php_smart_str.h" +#include "zend_smart_str.h"
static void static void
-send_mime( httpd_conn* hc, int status, char* title, char* encodings, char* extraheads, char* type, int length, time_t mod ) -send_mime( httpd_conn* hc, int status, char* title, char* encodings, char* extraheads, char* type, int length, time_t mod )

2
sapi/tux/php_tux.c
View file

@ -21,7 +21,7 @@
#include "php_main.h" #include "php_main.h"
#include "php_variables.h" #include "php_variables.h"
#include "ext/standard/php_smart_str.h" #include "zend_smart_str.h"
#include "tuxmodule.h" #include "tuxmodule.h"