iliaa Sat Jan 18 14:49:26 2003 EDT
Modified files:
/php4/ext/iconv iconv.c
/php4/ext/hyperwave hw.c
/php4/ext/hwapi hwapi.cpp
/php4/ext/fdf fdf.c
/php4/ext/fbsql php_fbsql.c
/php4/ext/domxml php_domxml.c
/php4/ext/dbx dbx.c dbx_odbc.c
/php4/ext/dba dba.c
/php4/ext/db db.c
/php4/ext/bz2 bz2.c
Log:
Removed pointless memory allocation checks.
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.82 php4/ext/iconv/iconv.c:1.83
--- php4/ext/iconv/iconv.c:1.82 Tue Jan 14 14:26:00 2003
+++ php4/ext/iconv/iconv.c Sat Jan 18 14:49:21 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.82 2003/01/14 19:26:00 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.83 2003/01/18 19:49:21 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -423,13 +423,10 @@
bsz += in_len;
tmp_buf = (char*) erealloc(out_buf, bsz+1);
-
- if (tmp_buf != NULL) {
- out_p = out_buf = tmp_buf;
- out_p += out_size;
- out_left = bsz - out_size;
- continue;
- }
+ out_p = out_buf = tmp_buf;
+ out_p += out_size;
+ out_left = bsz - out_size;
+ continue;
}
}
break;
@@ -448,10 +445,6 @@
if (errno == E2BIG) {
bsz += 16;
tmp_buf = (char *) erealloc(out_buf, bsz);
-
- if (tmp_buf == NULL) {
- break;
- }
out_p = out_buf = tmp_buf;
out_p += out_size;
@@ -1818,9 +1811,7 @@
return;
if (!strcasecmp("all", type)) {
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
add_assoc_string(return_value, "input_encoding",
ICONVG(input_encoding), 1);
add_assoc_string(return_value, "output_encoding",
ICONVG(output_encoding), 1);
add_assoc_string(return_value, "internal_encoding",
ICONVG(internal_encoding), 1);
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.115 php4/ext/hyperwave/hw.c:1.116
--- php4/ext/hyperwave/hw.c:1.115 Tue Jan 14 21:54:51 2003
+++ php4/ext/hyperwave/hw.c Sat Jan 18 14:49:22 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hw.c,v 1.115 2003/01/15 02:54:51 iliaa Exp $ */
+/* $Id: hw.c,v 1.116 2003/01/18 19:49:22 iliaa Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -255,13 +255,7 @@
int hidden, collhead, fullcollhead, total;
int collheadnr, fullcollheadnr;
- if (array_init(*return_value) == FAILURE) {
- /* Ups, failed! Let's at least free the memory */
- for(i=0; i<count; i++)
- efree(objrecs[i]);
- efree(objrecs);
- return -1;
- }
+ array_init(*return_value);
hidden = collhead = fullcollhead = total = 0;
collheadnr = fullcollheadnr = -1;
@@ -288,9 +282,7 @@
/* Array for statistics */
MAKE_STD_ZVAL(stat_arr);
- if (array_init(stat_arr) == FAILURE) {
- return -1;
- }
+ array_init(stat_arr);
add_assoc_long(stat_arr, "Hidden", hidden);
add_assoc_long(stat_arr, "CollectionHead", collhead);
@@ -332,12 +324,7 @@
add_assoc_long(spec_arr, "SQLStmt", HW_ATTR_NR);
}
- if (array_init(*return_value) == FAILURE) {
- Z_TYPE_PP(return_value) = IS_STRING;
- Z_STRVAL_PP(return_value) = empty_string;
- Z_STRLEN_PP(return_value) = 0;
- return -1;
- }
+ array_init(*return_value);
/* Loop through the attributes of object record and check
if the attribute has a specification. If it has the value
@@ -438,12 +425,7 @@
MAKE_STD_ZVAL(keyword_arr);
MAKE_STD_ZVAL(group_arr);
- if (array_init(*return_value) == FAILURE) {
- Z_TYPE_PP(return_value) = IS_STRING;
- Z_STRVAL_PP(return_value) = empty_string;
- Z_STRLEN_PP(return_value) = 0;
- return -1;
- }
+ array_init(*return_value);
/* Fill Array of titles, descriptions and keywords */
temp = estrdup(objrec);
@@ -455,30 +437,34 @@
iKeyword = 0;
iGroup = 0;
if(0 == strncmp(attrname, "Title=", 6)) {
- if ((hasTitle == 0) && (array_init(title_arr) == FAILURE)) {
+ if (hasTitle == 0) {
return -1;
}
+ array_init(title_arr);
hasTitle = 1;
str += 6;
iTitle = 1;
} else if(0 == strncmp(attrname, "Description=", 12)) {
- if ((hasDescription == 0) && (array_init(desc_arr) ==
FAILURE)) {
+ if (hasDescription == 0) {
return -1;
}
+ array_init(desc_arr);
hasDescription = 1;
str += 12;
iDesc = 1;
} else if(0 == strncmp(attrname, "Keyword=", 8)) {
- if ((hasKeyword == 0) && (array_init(keyword_arr) == FAILURE))
{
+ if (hasKeyword == 0) {
return -1;
}
+ array_init(keyword_arr);
hasKeyword = 1;
str += 8;
iKeyword = 1;
} else if(0 == strncmp(attrname, "Group=", 6)) {
- if ((hasGroup == 0) && (array_init(group_arr) == FAILURE)) {
+ if (hasGroup == 0) {
return -1;
}
+ array_init(group_arr);
hasGroup = 1;
str += 6;
iGroup = 1;
@@ -1414,10 +1400,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(object);
- RETURN_FALSE;
- }
+ array_init(return_value);
temp = estrdup(ptr);
attrname = php_strtok_r(temp, "\n", &strtok_buf);
@@ -1426,10 +1409,7 @@
char *name;
ALLOC_ZVAL(user_arr);
- if (array_init(user_arr) == FAILURE) {
- efree(object);
- RETURN_FALSE;
- }
+ array_init(user_arr);
ptr = attrname;
if(*ptr++ == '*')
@@ -1594,10 +1574,7 @@
RETURN_FALSE;
}
efree(ids);
- if (array_init(return_value) == FAILURE) {
- efree(objects);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++) {
add_index_string(return_value, i, objects[i], 0);
@@ -2390,10 +2367,7 @@
Z_LVAL_P(return_value) = zend_list_insert(doc, le_document);
Z_TYPE_P(return_value) = IS_LONG;
} else {
- if (array_init(return_value) == FAILURE) {
- efree(offsets);
- RETURN_FALSE;
- }
+ array_init(return_value);
ptr1 = remainder;
for(i=0; i<count; i++) {
@@ -3015,10 +2989,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(childIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++) {
add_index_long(return_value, i, childIDs[i]);
@@ -3055,10 +3026,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(childIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++) {
add_index_long(return_value, i, childIDs[i]);
@@ -3125,10 +3093,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(childIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++) {
add_index_long(return_value, i, childIDs[i]);
@@ -3252,10 +3217,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(childIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++)
add_index_long(return_value, i, childIDs[i]);
@@ -3325,10 +3287,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(childIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++)
add_index_long(return_value, i, childIDs[i]);
@@ -3399,10 +3358,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(childIDs);
- RETURN_FALSE;
- }
+ array_init(return_value) ;
for(i=0; i<count; i++)
add_index_long(return_value, i, childIDs[i]);
@@ -3474,10 +3430,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(childIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++)
add_index_long(return_value, i, childIDs[i]);
@@ -3544,10 +3497,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(childIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++)
add_index_long(return_value, i, childIDs[i]);
@@ -3608,10 +3558,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- efree(anchorIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<count; i++)
add_index_long(return_value, i, anchorIDs[i]);
@@ -3802,10 +3749,7 @@
if(objectIDs) efree(objectIDs);
if(collIDs) efree(collIDs);
- if (array_init(return_value) == FAILURE) {
- efree(retIDs);
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<cretids; i++)
add_index_long(return_value, i, retIDs[i]);
Index: php4/ext/hwapi/hwapi.cpp
diff -u php4/ext/hwapi/hwapi.cpp:1.3 php4/ext/hwapi/hwapi.cpp:1.4
--- php4/ext/hwapi/hwapi.cpp:1.3 Tue Jan 14 21:54:51 2003
+++ php4/ext/hwapi/hwapi.cpp Sat Jan 18 14:49:22 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hwapi.cpp,v 1.3 2003/01/15 02:54:51 iliaa Exp $ */
+/* $Id: hwapi.cpp,v 1.4 2003/01/18 19:49:22 iliaa Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -311,9 +311,7 @@
}
static int stringArray2indexArray(pval **return_value, HW_API_StringArray *values) {
- if (array_init(*return_value) == FAILURE) {
- return 0;
- }
+ array_init(*return_value);
for (int i=0; i<values->count(); i++) {
HW_API_String str;
values->string(i, str);
@@ -324,9 +322,7 @@
}
static int objectArray2indexArray(pval **return_value, HW_API_ObjectArray *objarr) {
- if (array_init(*return_value) == FAILURE) {
- return 0;
- }
+ array_init(*return_value);
for(int i=0; i<objarr->count(); i++) {
zval *child;
@@ -2400,9 +2396,7 @@
objarr = (HW_API_ObjectArray) out.objects();
}
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<objarr.count(); i++) {
zval *child;
@@ -2544,9 +2538,7 @@
/* FIXME: No a good idea to return just the objects. There is actually
* more to return. Changing this to an object of type hw_api_find_out would
* mean to change hw_api_parents() and hw_api_children() as well. */
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
/* FIXME: More than just the list of objects is returned by find() */
if(0 == objectArray2indexArray(&rv, &objarr)) {
@@ -4092,9 +4084,7 @@
if (!out.error().error()) {
HW_API_StringArray languages, customidx, systemidx;
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
HW_API_Object *object = new HW_API_Object(out.typeInfo());
rv = php_hwapi_object_new(object, le_hwapi_objectp);
zend_hash_add(return_value->value.ht, "typeInfo", 9, &rv, sizeof(zval
*), NULL);
@@ -4588,16 +4578,13 @@
Z_TYPE_PP(arg1) = IS_STRING;
/* FIXME: Need to finish the new zval */
value = (char *) emalloc(Z_LVAL_PP(arg2)+1);
- if(value) {
- Z_STRVAL_PP(arg1) = value;
- len = contentp->read(value, Z_LVAL_PP(arg2));
- value[len] = '\0';
- Z_STRLEN_PP(arg1) = len;
- RETURN_LONG(len);
- } else {
- RETURN_FALSE;
- }
+ Z_STRVAL_PP(arg1) = value;
+ len = contentp->read(value, Z_LVAL_PP(arg2));
+ value[len] = '\0';
+ Z_STRLEN_PP(arg1) = len;
+
+ RETURN_LONG(len);
}
/* }}} */
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.70 php4/ext/fdf/fdf.c:1.71
--- php4/ext/fdf/fdf.c:1.70 Tue Dec 31 11:06:35 2002
+++ php4/ext/fdf/fdf.c Sat Jan 18 14:49:22 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.70 2002/12/31 16:06:35 sebastian Exp $ */
+/* $Id: fdf.c,v 1.71 2003/01/18 19:49:22 iliaa Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -358,10 +358,7 @@
}
#if HAVE_FDFTK_5
} else if((err == FDFErcValueIsArray) && (which == -1)) {
- if (array_init(return_value) == FAILURE) {
- efree(buffer);
- FDF_FAILURE(FDFErcInternalError);
- }
+ array_init(return_value);
which = 0;
do {
err = FDFGetNthValue(fdf, fieldname, which, buffer, size-2,
&nr);
@@ -1037,9 +1034,7 @@
if(err != FDFErcOK) {
FDF_FAILURE(err);
}
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
add_next_index_stringl(return_value, buf1, strlen(buf1), 1);
add_next_index_stringl(return_value, buf2, strlen(buf2), 1);
efree(buf1);
@@ -1470,9 +1465,7 @@
FDF_FAILURE(err);
}
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
add_assoc_string(return_value, "path", pathbuf, 1);
add_assoc_string(return_value, "type", mimebuf, 1);
stat(pathbuf, &statBuf);
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.88 php4/ext/fbsql/php_fbsql.c:1.89
--- php4/ext/fbsql/php_fbsql.c:1.88 Tue Dec 31 11:06:34 2002
+++ php4/ext/fbsql/php_fbsql.c Sat Jan 18 14:49:22 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.88 2002/12/31 16:06:34 sebastian Exp $ */
+/* $Id: php_fbsql.c,v 1.89 2003/01/18 19:49:22 iliaa Exp $ */
/* TODO:
*
@@ -2815,10 +2815,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal result
type use FBSQL_NUM, FBSQL_ASSOC, or FBSQL_BOTH");
RETURN_FALSE;
}
- if (array_init(return_value)==FAILURE)
- {
- RETURN_FALSE;
- }
+ array_init(return_value);
if (result->fetchHandle == NULL)
{
if (result->array == NULL && result->list == NULL)
@@ -3015,7 +3012,7 @@
ZEND_FETCH_RESOURCE(result, PHPFBResult *, fbsql_result_index, -1,
"FrontBase-Result", le_result);
if (result->row == NULL) RETURN_FALSE;
- if (array_init(return_value)==FAILURE) RETURN_FALSE;
+ array_init(return_value);
for (i=0; i < result->columnCount; i++)
{
unsigned length = 0;
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.234 php4/ext/domxml/php_domxml.c:1.235
--- php4/ext/domxml/php_domxml.c:1.234 Tue Jan 14 15:07:52 2003
+++ php4/ext/domxml/php_domxml.c Sat Jan 18 14:49:23 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.234 2003/01/14 20:07:52 iliaa Exp $ */
+/* $Id: php_domxml.c,v 1.235 2003/01/18 19:49:23 iliaa Exp $ */
/* TODO
* - Support Notation Nodes
@@ -1343,9 +1343,7 @@
zval *errormessages;
MAKE_STD_ZVAL(errormessages);
- if(array_init(errormessages) != SUCCESS) {
- /* do error handling here */
- }
+ array_init(errormessages);
add_assoc_string(errormessages,"errormessage",buf,1);
input = ctxt->input;
if (ctxt->name) {
@@ -1380,9 +1378,7 @@
if (ctxt != NULL && ctxt->errors != NULL) {
zval *errormessages;
MAKE_STD_ZVAL(errormessages);
- if(array_init(errormessages) != SUCCESS) {
- /* do error handling here */
- }
+ array_init(errormessages);
if (ctxt->parser != NULL) {
if (ctxt->parser->name) {
add_assoc_string(errormessages,"nodename",ctxt->parser->name,1);
@@ -2254,9 +2250,7 @@
else
last = nodep->children;
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
if (last) {
while (last) {
@@ -2932,9 +2926,6 @@
}
ctxp->node = contextnodep;
str = (char*) emalloc((name_len+3) * sizeof(char)) ;
- if (str == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot allocate memory
for string");
- }
sprintf(str ,"//%s",name);
xpathobjp = xmlXPathEval(str, ctxp);
@@ -2945,11 +2936,7 @@
}
MAKE_STD_ZVAL(rv);
- if(array_init(rv) != SUCCESS)
- {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required
array");
- RETURN_FALSE;
- }
+ array_init(rv);
switch (Z_TYPE_P(xpathobjp)) {
@@ -3040,10 +3027,7 @@
MAKE_STD_ZVAL(rv);
- if(array_init(rv) != SUCCESS) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required
array");
- RETURN_FALSE;
- }
+ array_init(rv);
nodesetp = php_get_elements_by_tagname(nodep, name, NULL);
@@ -3139,9 +3123,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
while (last) {
zval *child;
@@ -3170,9 +3152,7 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
while (last) {
zval *child;
@@ -3774,10 +3754,7 @@
ids = docp->ids;
if(ids) {
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
-
+ array_init(return_value);
xmlHashScan(ids, (void *)idsHashScanner2, return_value);
} else {
RETURN_FALSE;
@@ -4508,9 +4485,7 @@
/* create an php array for the children */
MAKE_STD_ZVAL(*attributes);
- if (array_init(*attributes) == FAILURE) {
- return -1;
- }
+ array_init(*attributes);
while (ns) {
zval *pattr;
@@ -4792,10 +4767,7 @@
xmlNodeSetPtr nodesetp;
MAKE_STD_ZVAL(arr);
- if (array_init(arr) == FAILURE) {
- zval_dtor(rv);
- RETURN_FALSE;
- }
+ array_init(arr);
if (NULL == (nodesetp = xpathobjp->nodesetval)) {
zval_dtor(rv);
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.44 php4/ext/dbx/dbx.c:1.45
--- php4/ext/dbx/dbx.c:1.44 Sat Jan 4 14:18:43 2003
+++ php4/ext/dbx/dbx.c Sat Jan 18 14:49:24 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbx.c,v 1.44 2003/01/04 19:18:43 helly Exp $ */
+/* $Id: dbx.c,v 1.45 2003/01/18 19:49:24 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -437,20 +437,12 @@
/* init info property as array and add to return_value as a property */
if (result_flags & DBX_RESULT_INFO) {
MAKE_STD_ZVAL(info);
- if (array_init(info) != SUCCESS) {
- zend_error(E_ERROR, "dbx_query: unable to create info-array
for results...");
- FREE_ZVAL(info);
- RETURN_LONG(0);
- }
+ array_init(info);
zend_hash_update(Z_OBJPROP_P(return_value), "info", 5, (void
*)&(info), sizeof(zval *), NULL);
}
/* init data property as array and add to return_value as a property */
MAKE_STD_ZVAL(data);
- if (array_init(data) != SUCCESS) {
- zend_error(E_ERROR, "dbx_query: unable to create data-array for
results...");
- FREE_ZVAL(data);
- RETURN_LONG(0);
- }
+ array_init(data);
zend_hash_update(Z_OBJPROP_P(return_value), "data", 5, (void *)&(data),
sizeof(zval *), NULL);
/* get columncount and add to returnvalue as property */
MAKE_STD_ZVAL(rv_column_count);
@@ -468,18 +460,8 @@
zval *info_row_type;
MAKE_STD_ZVAL(info_row_name);
MAKE_STD_ZVAL(info_row_type);
- if (array_init(info_row_name) != SUCCESS) {
- zend_error(E_ERROR, "dbx_query: unable to create
info_row_name-array for results...");
- FREE_ZVAL(info_row_name);
- FREE_ZVAL(info_row_type);
- RETURN_LONG(0);
- }
- if (array_init(info_row_type) != SUCCESS) {
- zend_error(E_ERROR, "dbx_query: unable to create
info_row_type-array for results...");
- FREE_ZVAL(info_row_name);
- FREE_ZVAL(info_row_type);
- RETURN_LONG(0);
- }
+ array_init(info_row_name);
+ array_init(info_row_type);
for (col_index=0; col_index<Z_LVAL_P(rv_column_count); ++col_index) {
zval *rv_column_name;
zval *rv_column_type;
Index: php4/ext/dbx/dbx_odbc.c
diff -u php4/ext/dbx/dbx_odbc.c:1.20 php4/ext/dbx/dbx_odbc.c:1.21
--- php4/ext/dbx/dbx_odbc.c:1.20 Tue Dec 31 11:06:28 2002
+++ php4/ext/dbx/dbx_odbc.c Sat Jan 18 14:49:24 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbx_odbc.c,v 1.20 2002/12/31 16:06:28 sebastian Exp $ */
+/* $Id: dbx_odbc.c,v 1.21 2003/01/18 19:49:24 iliaa Exp $ */
#include "dbx.h"
#include "dbx_odbc.h"
@@ -233,11 +233,7 @@
zval_ptr_dtor(&fetch_row_result_zval);
/* fill array with field results... */
MAKE_STD_ZVAL(returned_zval);
- if (array_init(returned_zval) != SUCCESS) {
- zend_error(E_ERROR, "dbx_odbc_getrow: unable to create
result-array...");
- FREE_ZVAL(returned_zval);
- return 0;
- }
+ array_init(returned_zval);
MAKE_STD_ZVAL(field_index_zval);
ZVAL_LONG(field_index_zval, 0);
number_of_arguments=2;
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.80 php4/ext/dba/dba.c:1.81
--- php4/ext/dba/dba.c:1.80 Sun Jan 5 20:08:59 2003
+++ php4/ext/dba/dba.c Sat Jan 18 14:49:25 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.80 2003/01/06 01:08:59 edink Exp $ */
+/* $Id: dba.c,v 1.81 2003/01/18 19:49:25 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -841,10 +841,8 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to initialize
array");
- RETURN_FALSE;
- }
+ array_init(return_value);
+
for(hptr = handler; hptr->name; hptr++) {
if (full_info) {
add_assoc_string(return_value, hptr->name, hptr->info(hptr,
NULL TSRMLS_CC), 0);
@@ -868,10 +866,8 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to initialize
array");
- RETURN_FALSE;
- }
+ array_init(return_value);
+
numitems = zend_hash_next_free_element(&EG(regular_list));
for (i=1; i<numitems; i++) {
if (zend_hash_index_find(&EG(regular_list), i, (void **)
&le)==FAILURE) {
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.83 php4/ext/db/db.c:1.84
--- php4/ext/db/db.c:1.83 Tue Dec 31 11:06:22 2002
+++ php4/ext/db/db.c Sat Jan 18 14:49:25 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: db.c,v 1.83 2002/12/31 16:06:22 sebastian Exp $ */
+/* $Id: db.c,v 1.84 2003/01/18 19:49:25 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -198,10 +198,8 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to initialize
array");
- RETURN_FALSE;
- }
+ array_init(return_value);
+
numitems = zend_hash_next_free_element(&EG(regular_list));
for (i=1; i<numitems; i++) {
if (zend_hash_index_find(&EG(regular_list), i, (void **)
&le)==FAILURE) {
@@ -395,10 +393,6 @@
if (dbf) {
info = (dbm_info *)emalloc(sizeof(dbm_info));
- if (!info) {
- php_error_docref1(NULL TSRMLS_CC, filename, E_ERROR, "Problem
allocating memory!");
- return NULL;
- }
info->filename = estrdup(filename);
info->lockfn = lockfn;
Index: php4/ext/bz2/bz2.c
diff -u php4/ext/bz2/bz2.c:1.63 php4/ext/bz2/bz2.c:1.64
--- php4/ext/bz2/bz2.c:1.63 Tue Dec 31 11:06:14 2002
+++ php4/ext/bz2/bz2.c Sat Jan 18 14:49:25 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.63 2002/12/31 16:06:14 sebastian Exp $ */
+/* $Id: bz2.c,v 1.64 2003/01/18 19:49:25 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -387,9 +387,7 @@
dest_len = Z_STRLEN_PP(source) + (0.01 * Z_STRLEN_PP(source)) + 600;
/* Allocate the destination buffer */
- if (NULL == (dest = emalloc(dest_len + 1))) {
- RETURN_LONG(BZ_MEM_ERROR);
- }
+ dest = emalloc(dest_len + 1);
/* Handle the optional arguments */
if (argc > 1) {
@@ -452,9 +450,7 @@
/* Depending on the size of the source buffer, either allocate
the length of the source buffer or the a default decompression
size */
- if (NULL == (dest = emalloc(PHP_BZ_DECOMPRESS_SIZE > Z_STRLEN_PP(source) ?
PHP_BZ_DECOMPRESS_SIZE : Z_STRLEN_PP(source)))) {
- RETURN_LONG(BZ_MEM_ERROR);
- }
+ dest = emalloc(PHP_BZ_DECOMPRESS_SIZE > Z_STRLEN_PP(source) ?
+PHP_BZ_DECOMPRESS_SIZE : Z_STRLEN_PP(source));
/* (de)Compression Loop */
do {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
