cleanup

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 5fb5990050008747552fa4e9656040d1071d95e3..10384da2add81503d89e00ec3ae386640ccb8664 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2954,7 +2954,7 @@ static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
        odbc_connection *conn;
        zval *pv_handle;
-       char *ptr;
+       zend_string *ptr;
        int len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &pv_handle) == FAILURE) {
@@ -2969,23 +2969,21 @@ static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode)
 
        if (ZEND_NUM_ARGS() == 1) {
                ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_handle, -1, "ODBC-Link", le_conn, le_pconn);
-               ptr = ecalloc(len + 1, 1);
+               ptr = STR_ALLOC(len + 1, 0);
                if (mode == 0) {
-                       strlcpy(ptr, conn->laststate, len+1);
+                       strlcpy(ptr->val, conn->laststate, len+1);
                } else {
-                       strlcpy(ptr, conn->lasterrormsg, len+1);
+                       strlcpy(ptr->val, conn->lasterrormsg, len+1);
                }
        } else {
-               ptr = ecalloc(len + 1, 1);
+               ptr = STR_ALLOC(len, 0);
                if (mode == 0) {
-                       strlcpy(ptr, ODBCG(laststate), len+1);
+                       strlcpy(ptr->val, ODBCG(laststate), len+1);
                } else {
-                       strlcpy(ptr, ODBCG(lasterrormsg), len+1);
+                       strlcpy(ptr->val, ODBCG(lasterrormsg), len+1);
                }
        }
-       RETVAL_STRING(ptr);
-       // TODO: avoid double reallocation ???
-       efree(ptr);
+       RETVAL_STR(ptr);
 }
 /* }}} */
 

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index bfe17e6a13a9c41a56127ee6c1aee44fa020c533..632a94ae62c4720136baf8052b7b44619aa29190 100644 (file)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -84,17 +84,12 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
        }
 
        if (NULL != (stuff = zend_hash_str_find(_SERVER, "PATH_TRANSLATED", sizeof("PATH_TRANSLATED")-1))) {
-               char *str = NULL;
-               int len;
-
-               // TODO: avoid reallocation ???
-               len = spprintf(&str, 4096, "phar://%s%s", fname, entry);
+               zend_string *str = strpprintf(4096, "phar://%s%s", fname, entry);
 
                ZVAL_STR(&temp, Z_STR_P(stuff));
-               ZVAL_STRINGL(stuff, str, len);
-               efree(str);
+               ZVAL_STR(stuff, str);
 
-               zend_hash_str_update(_SERVER, "PHAR_PATH_TRANSLATED", sizeof("PHAR_PATH_TRANSLATED")-1, (void *) &temp);
+               zend_hash_str_update(_SERVER, "PHAR_PATH_TRANSLATED", sizeof("PHAR_PATH_TRANSLATED")-1, &temp);
        }
 
        if (!PHAR_GLOBALS->phar_SERVER_mung_list) {
@@ -136,15 +131,10 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
 
        if (PHAR_GLOBALS->phar_SERVER_mung_list & PHAR_MUNG_SCRIPT_FILENAME) {
                if (NULL != (stuff = zend_hash_str_find(_SERVER, "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME")-1))) {
-                       char *str = NULL;
-                       int len;
-
-                       // TODO: avoid reallocation ???
-                       len = spprintf(&str, 4096, "phar://%s%s", fname, entry);
+                       zend_string *str = strpprintf(4096, "phar://%s%s", fname, entry);
 
                        ZVAL_STR(&temp, Z_STR_P(stuff));
-                       ZVAL_STRINGL(stuff, str, len);
-                       efree(str);
+                       ZVAL_STR(stuff, str);
 
                        zend_hash_str_update(_SERVER, "PHAR_SCRIPT_FILENAME", sizeof("PHAR_SCRIPT_FILENAME")-1, &temp);
                }
@@ -3033,8 +3023,7 @@ PHP_METHOD(Phar, getSignature)
        }
 
        if (phar_obj->archive->signature) {
-               char *unknown;
-               int unknown_len;
+               zend_string *unknown;
 
                array_init(return_value);
                add_assoc_stringl(return_value, "hash", phar_obj->archive->signature, phar_obj->archive->sig_len);
@@ -3055,10 +3044,8 @@ PHP_METHOD(Phar, getSignature)
                                add_assoc_stringl(return_value, "hash_type", "OpenSSL", 7);
                                break;
                        default:
-                               unknown_len = spprintf(&unknown, 0, "Unknown (%u)", phar_obj->archive->sig_flags);
-                               // TODO: avoid reallocation ???
-                               add_assoc_stringl(return_value, "hash_type", unknown, unknown_len);
-                               efree(unknown);
+                               unknown = strpprintf(0, "Unknown (%u)", phar_obj->archive->sig_flags);
+                               add_assoc_str(return_value, "hash_type", unknown);
                                break;
                }
        } else {
@@ -3520,6 +3507,7 @@ PHP_METHOD(Phar, offsetGet)
        zval zfname;
        phar_entry_info *entry;
        PHAR_ARCHIVE_OBJECT();
+       zend_string *sfname;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &fname, &fname_len) == FAILURE) {
                return;
@@ -3549,10 +3537,8 @@ PHP_METHOD(Phar, offsetGet)
                        efree(entry);
                }
 
-               fname_len = spprintf(&fname, 0, "phar://%s/%s", phar_obj->archive->fname, fname);
-               /* TODO: avoid reallocation ??? */
-               ZVAL_STRINGL(&zfname, fname, fname_len);
-               efree(fname);
+               sfname = strpprintf(0, "phar://%s/%s", phar_obj->archive->fname, fname);
+               ZVAL_STR(&zfname, sfname);
                spl_instantiate_arg_ex1(phar_obj->spl.info_class, return_value, &zfname TSRMLS_CC);
                zval_ptr_dtor(&zfname);
        }
@@ -3837,7 +3823,7 @@ PHP_METHOD(Phar, addFromString)
 PHP_METHOD(Phar, getStub)
 {
        size_t len;
-       char *buf;
+       zend_string *buf;
        php_stream *fp;
        php_stream_filter *filter = NULL;
        phar_entry_info *stub;
@@ -3903,15 +3889,15 @@ PHP_METHOD(Phar, getStub)
 
        php_stream_rewind(fp);
 carry_on:
-       buf = safe_emalloc(len, 1, 1);
+       buf = STR_ALLOC(len, 0);
 
-       if (len != php_stream_read(fp, buf, len)) {
+       if (len != php_stream_read(fp, buf->val, len)) {
                if (fp != phar_obj->archive->fp) {
                        php_stream_close(fp);
                }
                zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
                        "Unable to read stub");
-               efree(buf);
+               STR_RELEASE(buf);
                return;
        }
 
@@ -3924,10 +3910,9 @@ carry_on:
                php_stream_close(fp);
        }
 
-       buf[len] = '\0';
-       // TODO: avoid reallocation ???
-       RETVAL_STRINGL(buf, len);
-       efree(buf);
+       buf->val[len] = '\0';
+       buf->len = len;
+       RETVAL_STR(buf);
 }
 /* }}}*/
 

diff --git a/ext/phar/util.c b/ext/phar/util.c
index 4d260a4c13606fe4e9bb749e22164d2966c64a3e..4bac776511b00bcd3b6468ead762d5f5105dee09 100644 (file)
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -1510,11 +1510,6 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ
                        pfp = php_stream_open_wrapper(pfile, "rb", 0, NULL);
                        efree(pfile);
 
-//???#if PHP_MAJOR_VERSION > 5
-//???                  if (!pfp || !(pubkey_len = php_stream_copy_to_mem(pfp, (void **) &pubkey, PHP_STREAM_COPY_ALL, 0)) || !pubkey) {
-//???#else
-//???                  if (!pfp || !(pubkey_len = php_stream_copy_to_mem(pfp, &pubkey, PHP_STREAM_COPY_ALL, 0)) || !pubkey) {
-//???#endif
                        if (!pfp || !(pubkey = php_stream_copy_to_mem(pfp, PHP_STREAM_COPY_ALL, 0)) || !pubkey->len) {
                                if (pfp) {
                                        php_stream_close(pfp);

diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index 1fa386043d773992311163c89cc1e473a3189fd9..bb2a6c7a53fe19a027bb96801146cbb0915a0a26 100644 (file)
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -995,8 +995,7 @@ try_again:
                                add_index_string(&zcookie, 2, phpurl->host);
                        }
 
-                       // TODO: avoid reallocation ???
-                       add_assoc_zval_ex(cookies, name.s->val, name.s->len, &zcookie);
+                       zend_symtable_update(Z_ARRVAL_P(cookies), name.s, &zcookie);
                        smart_str_free(&name);
                }
 

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index ec2c2f0c17cb0e915722fba7a14370037ffe7037..a1d2ca4f484efb282360ed9e55113a2f7ce5097e 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -928,8 +928,7 @@ PHP_METHOD(SoapFault, SoapFault)
 PHP_METHOD(SoapFault, __toString)
 {
        zval *faultcode, *faultstring, *file, *line, trace;
-       char *str;
-       int len;
+       zend_string *str;
        zend_fcall_info fci;
        zval *this_ptr;
 
@@ -957,15 +956,13 @@ PHP_METHOD(SoapFault, __toString)
 
        zval_ptr_dtor(&fci.function_name);
 
-       len = spprintf(&str, 0, "SoapFault exception: [%s] %s in %s:%ld\nStack trace:\n%s",
+       str = strpprintf(0, "SoapFault exception: [%s] %s in %s:%ld\nStack trace:\n%s",
                       Z_STRVAL_P(faultcode), Z_STRVAL_P(faultstring), Z_STRVAL_P(file), Z_LVAL_P(line),
                       Z_STRLEN(trace) ? Z_STRVAL(trace) : "#0 {main}\n");
 
        zval_ptr_dtor(&trace);
 
-       // TODO: avoid reallocation ???
-       RETVAL_STRINGL(str, len);
-       efree(str);
+       RETVAL_STR(str);
 }
 /* }}} */
 

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index e0b728c8823a076c366ee80353ced2cca7244840..7dce126ac3291479cc2f8a05eee2e3a779af8898 100644 (file)
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -340,7 +340,6 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
 
        /* create the object */
        object_init_ex(&obj, fdat->ce);
-//???  Z_SET_ISREF_P(obj);
 
        /* filtername */
        add_property_string(&obj, "filtername", (char*)filtername);

diff --git a/win32/sendmail.c b/win32/sendmail.c
index ed9736c1ddf2dab08d53af6f3e6d0da7b41ad679..c191e0f3aa0da84d1dfbb6171e240fbda5855db8 100644 (file)
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -616,9 +616,6 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char
                return (res);
        }
 
-//???PHPAPI zend_string *php_str_to_str(char *haystack, int length, char *needle,
-//???          int needle_len, char *str, int str_len);
-       
        /* Escape \n. sequences
         * We use php_str_to_str() and not php_str_replace_in_subject(), since the latter
         * uses ZVAL as it's parameters */