Move smart_str implementation into Zend/

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.

Zend/zend_smart_str.h

@@ -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_smart_str_public.h"
 
 #ifndef SMART_STR_PREALLOC
 #define SMART_STR_PREALLOC 128
@@ -34,8 +30,6 @@
 #define SMART_STR_START_SIZE 78
 #endif
 
-/* wrapper */
-
 #define smart_str_appends_ex(dest, src, what) \
 	smart_str_appendl_ex((dest), (src), strlen(src), (what))
 #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
+

Zend/zend_smart_str_public.h

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

ext/curl/interface.c

@@ -82,7 +82,7 @@
 
 #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/file.h"
 #include "ext/standard/url.h"

ext/curl/php_curl.h

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

ext/date/php_date.c

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

ext/dba/dba.c

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

ext/filter/sanitizing_filters.c

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

ext/gmp/gmp.c

@@ -25,7 +25,7 @@
 #include "php_gmp.h"
 #include "ext/standard/info.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"
 
 #if HAVE_GMP

ext/iconv/iconv.c

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

ext/imap/php_imap.c

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

ext/intl/intl_error.h

@@ -21,7 +21,7 @@
 
 #include <unicode/utypes.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
 

ext/intl/locale/locale_methods.c

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

ext/intl/transliterator/transliterator.h

@@ -21,7 +21,7 @@
 #include <unicode/utypes.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 );
 smart_str transliterator_parse_error_to_string( UParseError* pe );

ext/json/JSON_parser.h

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

ext/json/json.c

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

ext/json/php_json.h

@@ -22,7 +22,7 @@
 #define PHP_JSON_H
 
 #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;
 #define phpext_json_ptr &json_module_entry

ext/libxml/php_libxml.h

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

ext/mbstring/php_mbregex.c

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

ext/mcrypt/mcrypt.c

@@ -40,7 +40,7 @@
 #include "php_globals.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_rand.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "php_mcrypt_filter.h"
 
 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) /* {{{ */
 {

ext/mysqli/mysqli_api.c

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

ext/mysqli/mysqli_nonapi.c

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

ext/mysqlnd/mysqlnd.c

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

ext/mysqlnd/mysqlnd_alloc.c

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

ext/mysqlnd/mysqlnd_structs.h

@@ -23,7 +23,7 @@
 #ifndef 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
 

ext/mysqlnd/php_mysqlnd.c

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

ext/oci8/oci8.c

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

ext/openssl/xp_ssl.c

@@ -28,7 +28,7 @@
 #include "ext/standard/file.h"
 #include "ext/standard/url.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_network.h"
 #include <openssl/ssl.h>

ext/pcre/php_pcre.c

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

ext/pgsql/pgsql.c

@@ -35,7 +35,7 @@
 #include "php.h"
 #include "php_ini.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"
 #ifdef PHP_WIN32
 # include "win32/time.h"

ext/phar/phar_internal.h

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

ext/readline/readline_cli.c

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

ext/readline/readline_cli.h

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

ext/session/session.c

@@ -48,7 +48,7 @@
 #include "ext/standard/url_scanner_ex.h"
 #include "ext/standard/php_rand.h" /* for RAND_MAX */
 #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/basic_functions.h"
 #include "ext/standard/head.h"

ext/soap/php_soap.h

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

ext/sockets/conversions.c

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

ext/spl/spl_array.c

@@ -26,7 +26,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.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_exceptions.h"
 

ext/spl/spl_dllist.c

@@ -29,7 +29,7 @@
 #include "php_spl.h"
 #include "ext/standard/info.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_engine.h"
 #include "spl_iterators.h"

ext/spl/spl_iterators.c

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

ext/spl/spl_observer.c

@@ -28,7 +28,7 @@
 #include "ext/standard/info.h"
 #include "ext/standard/php_array.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_exceptions.h"
 

ext/standard/array.c

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

ext/standard/file.c

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

ext/standard/filters.c

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

ext/standard/http_fopen_wrapper.c

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

ext/standard/php_http.h

@@ -22,7 +22,7 @@
 #define PHP_HTTP_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,
 				const char *num_prefix, int num_prefix_len,

ext/standard/php_var.h

@@ -22,7 +22,7 @@
 #define PHP_VAR_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_export);

ext/standard/string.c

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

ext/standard/url_scanner_ex.c

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

ext/standard/url_scanner_ex.h

@@ -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_reset_vars(TSRMLS_D);
 
-#include "php_smart_str_public.h"
+#include "zend_smart_str_public.h"
 
 typedef struct {
 	/* Used by the mainloop of the scanner */

ext/standard/url_scanner_ex.re

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

ext/standard/var.c

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

ext/sysvmsg/sysvmsg.c

@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "php_sysvmsg.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
  * of knowing what the bit definitions are, so we can't just define

ext/sysvshm/sysvshm.c

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

ext/wddx/php_wddx_api.h

@@ -21,7 +21,7 @@
 #ifndef 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_E			"</array>"

ext/wddx/wddx.c

@@ -35,7 +35,7 @@
 #include "ext/standard/php_incomplete_class.h"
 #include "ext/standard/base64.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/php_string.h"
 #include "ext/date/php_date.h"

main/php_variables.c

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

main/spprintf.c

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

sapi/apache2filter/php_functions.c

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

sapi/apache2filter/sapi_apache2.c

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

sapi/apache2handler/php_functions.c

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

sapi/apache2handler/sapi_apache2.c

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

sapi/cli/php_cli_server.c

@@ -96,7 +96,7 @@
 #endif
 
 #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/url.h" /* for php_url_decode() */
 #include "ext/standard/php_string.h" /* for php_dirname() */

sapi/thttpd/thttpd.c

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

sapi/thttpd/thttpd_patch

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

sapi/tux/php_tux.c

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