 |
 |
Find a programming school near you
php4-beta | 199912
Date: 12/24/99
- Next message: rasmus <email protected>: "Re: [PHP4BETA] a bit OT"
- Previous message: Andi Gutmans: "Re: [PHP4BETA] cvs: /php4/ext/hyperwave hw.c /php4/ext/pcre php_pcre.c /php4/ext/session session.c /php4/ext/standard array.c /php4/ext/wddx wddx.c /php4/sapi/isapi php4isapi.c"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
andi Fri Dec 24 12:39:59 1999 EDT
Modified files:
/php4 apidoc-zend.txt main.c rfc1867.c
/php4/ext/com COM.c
/php4/ext/dav dav.c
/php4/ext/java java.c
/php4/ext/odbc php_odbc.c
/php4/ext/standard iptc.c post.c var.c
/php4/ext/sybase_ct php_sybase_ct.c
Log:
- Move more stuff to ALLOC_ZVAL(). We need to add those FREE_ZVAL()'s now.
Index: php4/apidoc-zend.txt
diff -u php4/apidoc-zend.txt:1.2 php4/apidoc-zend.txt:1.3
--- php4/apidoc-zend.txt:1.2 Sat May 22 05:24:19 1999
+++ php4/apidoc-zend.txt Fri Dec 24 12:39:23 1999
@@ -64,7 +64,7 @@
php4_write()
{
- pval *newval = (pval *) emalloc(sizeof(pval));
+ pval *newval = ALLOC_ZVAL();
newval->refcount=1;
newval->is_ref=0;
Index: php4/main.c
diff -u php4/main.c:1.166 php4/main.c:1.167
--- php4/main.c:1.166 Tue Dec 21 15:35:41 1999
+++ php4/main.c Fri Dec 24 12:39:23 1999
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.166 1999/12/21 20:35:41 zeev Exp $ */
+/* $Id: main.c,v 1.167 1999/12/24 17:39:23 andi Exp $ */
#include <stdio.h>
@@ -446,7 +446,7 @@
va_end(args);
buffer[sizeof(buffer) - 1] = 0;
- tmp = (pval *)emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
INIT_PZVAL(tmp);
tmp->value.str.val = (char *) estrndup(buffer, size);
tmp->value.str.len = size;
@@ -1079,7 +1079,7 @@
continue;
}
t = estrndup(*env, p - *env);
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
tmp->value.str.len = strlen(p + 1);
tmp->value.str.val = estrndup(p + 1, tmp->value.str.len);
tmp->type = IS_STRING;
@@ -1100,7 +1100,7 @@
for (i = 0; i < arr->nelts; i++) {
len = strlen(elts[i].key);
t = elts[i].key;
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
if (elts[i].val) {
tmp->value.str.len = strlen(elts[i].val);
tmp->value.str.val = estrndup(elts[i].val, tmp->value.str.len);
@@ -1117,7 +1117,7 @@
(*tmp_ptr)->refcount++;
zend_hash_update(&EG(symbol_table), "PATH_TRANSLATED", sizeof("PATH_TRANSLATED"), tmp_ptr, sizeof(pval *), NULL);
}
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
tmp->value.str.len = strlen(((request_rec *) SG(server_context))->uri);
tmp->value.str.val = estrndup(((request_rec *) SG(server_context))->uri, tmp->value.str.len);
INIT_PZVAL(tmp);
@@ -1130,7 +1130,7 @@
char *pi;
#if FORCE_CGI_REDIRECT
pi = SG(request_info).request_uri;
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
tmp->value.str.val = emalloc(((pi)?strlen(pi):0) + 1);
tmp->value.str.len = php_sprintf(tmp->value.str.val, "%s", (pi ? pi : "")); /* SAFE */
tmp->type = IS_STRING;
@@ -1148,7 +1148,7 @@
l -= strlen(pi);
pi = NULL;
}
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
tmp->value.str.val = emalloc(l + 1);
tmp->value.str.len = php_sprintf(tmp->value.str.val, "%s%s", (sn ? sn : ""), (pi ? pi : "")); /* SAFE */
tmp->type = IS_STRING;
@@ -1171,7 +1171,7 @@
int count = 0;
char *ss, *space;
- arr = (pval *) emalloc(sizeof(pval));
+ arr = ALLOC_ZVAL();
arr->value.ht = (HashTable *) emalloc(sizeof(HashTable));
if (zend_hash_init(arr->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0) == FAILURE) {
php_error(E_WARNING, "Unable to create argv array");
@@ -1188,7 +1188,7 @@
*space = '\0';
}
/* auto-type */
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
tmp->type = IS_STRING;
tmp->value.str.len = strlen(ss);
tmp->value.str.val = estrndup(ss, tmp->value.str.len);
@@ -1206,7 +1206,7 @@
ss = space;
}
}
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
tmp->value.lval = count;
tmp->type = IS_LONG;
INIT_PZVAL(tmp);
Index: php4/rfc1867.c
diff -u php4/rfc1867.c:1.16 php4/rfc1867.c:1.17
--- php4/rfc1867.c:1.16 Fri Dec 17 14:50:56 1999
+++ php4/rfc1867.c Fri Dec 24 12:39:23 1999
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf <rasmus <email protected>> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.16 1999/12/17 19:50:56 zeev Exp $ */
+/* $Id: rfc1867.c,v 1.17 1999/12/24 17:39:23 andi Exp $ */
#include <stdio.h>
#include "php.h"
@@ -45,7 +45,7 @@
PLS_FETCH();
if (PG(track_vars)) {
- http_post_vars = (pval *) emalloc(sizeof(pval));
+ http_post_vars = ALLOC_ZVAL();
array_init(http_post_vars);
INIT_PZVAL(http_post_vars);
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.18 php4/ext/com/COM.c:1.19
--- php4/ext/com/COM.c:1.18 Tue Dec 21 12:14:29 1999
+++ php4/ext/com/COM.c Fri Dec 24 12:39:24 1999
@@ -416,7 +416,7 @@
pval_arg->refcount=1;
zend_hash_init(pval_arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
- handle = (pval *) emalloc(sizeof(pval));
+ handle = ALLOC_ZVAL();
handle->type = IS_LONG;
handle->value.lval = zend_list_insert(var_arg->pdispVal, le_idispatch);
pval_copy_constructor(handle);
@@ -915,7 +915,7 @@
var_reset(object);
return;
}
- object_handle = (pval *) emalloc(sizeof(pval));
+ object_handle = ALLOC_ZVAL();
*object_handle = *return_value;
pval_copy_constructor(object_handle);
INIT_PZVAL(object_handle);
Index: php4/ext/dav/dav.c
diff -u php4/ext/dav/dav.c:1.7 php4/ext/dav/dav.c:1.8
--- php4/ext/dav/dav.c:1.7 Sat Dec 18 21:15:18 1999
+++ php4/ext/dav/dav.c Fri Dec 24 12:39:25 1999
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dav.c,v 1.7 1999/12/19 02:15:18 evan Exp $ */
+/* $Id: dav.c,v 1.8 1999/12/24 17:39:25 andi Exp $ */
#define IS_EXT_MODULE
#if COMPILE_DL
@@ -192,7 +192,7 @@
HashTable *function_table;
func = php3i_string_pval(funcName);
- retval = emalloc(sizeof(pval));
+ retval = ALLOC_ZVAL();
function_table = php3i_get_function_table();
if (call_user_function(function_table, NULL, func, retval, argc, argv) == FAILURE) {
php3tls_pval_destructor(retval);
Index: php4/ext/java/java.c
diff -u php4/ext/java/java.c:1.7 php4/ext/java/java.c:1.8
--- php4/ext/java/java.c:1.7 Tue Dec 21 12:14:30 1999
+++ php4/ext/java/java.c Fri Dec 24 12:39:25 1999
@@ -500,7 +500,7 @@
zend_hash_init(presult->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
};
- handle = (pval *) emalloc(sizeof(pval));
+ handle = ALLOC_ZVAL();
handle->type = IS_LONG;
handle->value.lval =
zend_list_insert((*jenv)->NewGlobalRef(jenv,value), le_jobject);
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.20 php4/ext/odbc/php_odbc.c:1.21
--- php4/ext/odbc/php_odbc.c:1.20 Tue Dec 21 15:35:42 1999
+++ php4/ext/odbc/php_odbc.c Fri Dec 24 12:39:26 1999
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.20 1999/12/21 20:35:42 zeev Exp $ */
+/* $Id: php_odbc.c,v 1.21 1999/12/24 17:39:26 andi Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
@@ -1096,7 +1096,7 @@
result->fetched++;
for(i = 0; i < result->numcols; i++) {
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
tmp->refcount = 1;
tmp->type = IS_STRING;
tmp->value.str.len = 0;
Index: php4/ext/standard/iptc.c
diff -u php4/ext/standard/iptc.c:1.14 php4/ext/standard/iptc.c:1.15
--- php4/ext/standard/iptc.c:1.14 Wed Dec 22 09:46:31 1999
+++ php4/ext/standard/iptc.c Fri Dec 24 12:39:26 1999
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iptc.c,v 1.14 1999/12/22 14:46:31 thies Exp $ */
+/* $Id: iptc.c,v 1.15 1999/12/24 17:39:26 andi Exp $ */
/*
* Functions to parse & compse IPTC data.
@@ -356,7 +356,7 @@
}
if (zend_hash_find(return_value->value.ht,key,strlen(key) + 1,(void **) &element) == FAILURE) {
- values = emalloc(sizeof(pval));
+ values = ALLOC_ZVAL();
INIT_PZVAL(values);
if (array_init(values) == FAILURE) {
php_error(E_ERROR, "Unable to initialize array");
Index: php4/ext/standard/post.c
diff -u php4/ext/standard/post.c:1.32 php4/ext/standard/post.c:1.33
--- php4/ext/standard/post.c:1.32 Fri Dec 17 23:01:14 1999
+++ php4/ext/standard/post.c Fri Dec 24 12:39:26 1999
@@ -112,7 +112,7 @@
}
/* Create the element */
- array_element = (pval *) emalloc(sizeof(pval));
+ array_element = ALLOC_ZVAL();
INIT_PZVAL(array_element);
array_element->value.str.val = val;
array_element->value.str.len = val_len;
@@ -315,7 +315,7 @@
case PARSE_GET:
case PARSE_COOKIE:
if (PG(track_vars)) {
- array_ptr = (pval *) emalloc(sizeof(pval));
+ array_ptr = ALLOC_ZVAL();
array_init(array_ptr);
INIT_PZVAL(array_ptr);
switch (arg) {
@@ -369,7 +369,7 @@
if((NULL != SG(request_info).content_type) && (0 == strcmp(SG(request_info).content_type, "application/vnd.fdf"))) {
pval *tmp;
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
tmp->value.str.len = SG(request_info).post_data_length;
tmp->value.str.val = estrndup(SG(request_info).post_data, SG(request_info).post_data_length);
tmp->type = IS_STRING;
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.40 php4/ext/standard/var.c:1.41
--- php4/ext/standard/var.c:1.40 Tue Dec 21 12:14:31 1999
+++ php4/ext/standard/var.c Fri Dec 24 12:39:26 1999
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.40 1999/12/21 17:14:31 andrei Exp $ */
+/* $Id: var.c,v 1.41 1999/12/24 17:39:26 andi Exp $ */
/* {{{ includes
@@ -96,7 +96,7 @@
}
switch (i) {
case HASH_KEY_IS_LONG:{
- pval *d = emalloc(sizeof(pval));
+ pval *d = ALLOC_ZVAL();
d->type = IS_LONG;
d->value.lval = index;
@@ -106,7 +106,7 @@
break;
case HASH_KEY_IS_STRING:{
- pval *d = emalloc(sizeof(pval));
+ pval *d = ALLOC_ZVAL();
d->type = IS_STRING;
d->value.str.val = key;
@@ -253,14 +253,14 @@
switch (i) {
case HASH_KEY_IS_LONG:
- d = emalloc(sizeof(pval));
+ d = ALLOC_ZVAL();
d->type = IS_LONG;
d->value.lval = index;
php_var_serialize(buf, &d);
efree(d);
break;
case HASH_KEY_IS_STRING:
- d = emalloc(sizeof(pval));
+ d = ALLOC_ZVAL();
d->type = IS_STRING;
d->value.str.val = key;
d->value.str.len = strlen(key);
@@ -431,8 +431,8 @@
return 0;
}
for ((*p) += 2; **p && **p != '}' && i > 0; i--) {
- pval *key = emalloc(sizeof(pval));
- pval *data = emalloc(sizeof(pval));
+ pval *key = ALLOC_ZVAL();
+ pval *data = ALLOC_ZVAL();
if (!php_var_unserialize(&key, p, max)) {
zval_dtor(key);
Index: php4/ext/sybase_ct/php_sybase_ct.c
diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.10 php4/ext/sybase_ct/php_sybase_ct.c:1.11
--- php4/ext/sybase_ct/php_sybase_ct.c:1.10 Sat Dec 4 14:16:08 1999
+++ php4/ext/sybase_ct/php_sybase_ct.c Fri Dec 24 12:39:27 1999
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.10 1999/12/04 19:16:08 sas Exp $ */
+/* $Id: php_sybase_ct.c,v 1.11 1999/12/24 17:39:27 andi Exp $ */
#include "php.h"
@@ -1224,7 +1224,7 @@
array_init(return_value);
for (i=0; i<result->num_fields; i++) {
- field_content = (pval *) emalloc(sizeof(pval));
+ field_content = ALLOC_ZVAL();
*field_content = result->data[result->cur_row][i];
INIT_PZVAL(field_content);
pval_copy_constructor(field_content);
@@ -1257,7 +1257,7 @@
}
for (i=0; i<result->num_fields; i++) {
- tmp = (pval *) emalloc(sizeof(pval));
+ tmp = ALLOC_ZVAL();
*tmp = result->data[result->cur_row][i];
INIT_PZVAL(tmp);
if (PG(magic_quotes_runtime) && tmp->type == IS_STRING) {
-- PHP 4.0 Beta Mailing List <http://www.php.net/version4/> To unsubscribe, e-mail: php4beta-unsubscribe <email protected> For additional commands, e-mail: php4beta-help <email protected> To contact the list administrators, e-mail: php4beta-admin <email protected>
- Next message: rasmus <email protected>: "Re: [PHP4BETA] a bit OT"
- Previous message: Andi Gutmans: "Re: [PHP4BETA] cvs: /php4/ext/hyperwave hw.c /php4/ext/pcre php_pcre.c /php4/ext/session session.c /php4/ext/standard array.c /php4/ext/wddx wddx.c /php4/sapi/isapi php4isapi.c"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
