sas Wed Nov 6 12:59:04 2002 EDT
Modified files:
/php4/ext/dba dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c
dba_flatfile.c dba_gdbm.c dba_ndbm.c
Log:
emalloc never returns 0, so we can simplify the code paths.
also replace ecalloc with emalloc+memset, so that the latter can be inlined.
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.54 php4/ext/dba/dba.c:1.55
--- php4/ext/dba/dba.c:1.54 Wed Nov 6 04:17:50 2002
+++ php4/ext/dba/dba.c Wed Nov 6 12:59:03 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.54 2002/11/06 09:17:50 helly Exp $ */
+/* $Id: dba.c,v 1.55 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -369,12 +369,12 @@
RETURN_FALSE;
}
- info = ecalloc(sizeof(dba_info), 1);
+ info = emalloc(sizeof(dba_info));
+ memset(info, 0, sizeof(dba_info));
info->path = estrdup(Z_STRVAL_PP(args[0]));
info->mode = modenr;
info->argc = ac - 3;
info->argv = args + 3;
- /* info->hnd is NULL here */
if (hptr->open(info, &error TSRMLS_CC) != SUCCESS) {
dba_close(info TSRMLS_CC);
Index: php4/ext/dba/dba_cdb.c
diff -u php4/ext/dba/dba_cdb.c:1.20 php4/ext/dba/dba_cdb.c:1.21
--- php4/ext/dba/dba_cdb.c:1.20 Tue Nov 5 09:46:35 2002
+++ php4/ext/dba/dba_cdb.c Wed Nov 6 12:59:03 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_cdb.c,v 1.20 2002/11/05 14:46:35 helly Exp $ */
+/* $Id: dba_cdb.c,v 1.21 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -104,17 +104,8 @@
return FAILURE;
}
- cdb = ecalloc(sizeof(dba_cdb), 1);
- if (!cdb) {
- pinfo->dbf = cdb;
-#if DBA_CDB_BUILTIN
- php_stream_close(file);
-#else
- close(file);
-#endif
- *error = "Out of memory";
- return FAILURE;
- }
+ cdb = emalloc(sizeof(dba_cdb));
+ memset(cdb, 0, sizeof(dba_cdb));
#if DBA_CDB_BUILTIN
if (make) {
Index: php4/ext/dba/dba_db2.c
diff -u php4/ext/dba/dba_db2.c:1.29 php4/ext/dba/dba_db2.c:1.30
--- php4/ext/dba/dba_db2.c:1.29 Tue Nov 5 09:46:35 2002
+++ php4/ext/dba/dba_db2.c Wed Nov 6 12:59:03 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_db2.c,v 1.29 2002/11/05 14:46:35 helly Exp $ */
+/* $Id: dba_db2.c,v 1.30 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -76,11 +76,8 @@
return FAILURE;
}
- info->dbf = ecalloc(sizeof(dba_db2_data), 1);
- if (!info->dbf) {
- *error = "Out of memory";
- return FAILURE;
- }
+ info->dbf = emalloc(sizeof(dba_db2_data));
+ memset(info->dbf, 0, sizeof(dba_db2_data));
((dba_db2_data *) info->dbf)->dbp = dbp;
return SUCCESS;
}
Index: php4/ext/dba/dba_db3.c
diff -u php4/ext/dba/dba_db3.c:1.20 php4/ext/dba/dba_db3.c:1.21
--- php4/ext/dba/dba_db3.c:1.20 Tue Nov 5 09:46:36 2002
+++ php4/ext/dba/dba_db3.c Wed Nov 6 12:59:03 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_db3.c,v 1.20 2002/11/05 14:46:36 helly Exp $ */
+/* $Id: dba_db3.c,v 1.21 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -78,10 +78,6 @@
dba_db3_data *data;
data = emalloc(sizeof(*data));
- if (!data) {
- *error = "Out of memory";
- return FAILURE;
- }
data->dbp = dbp;
data->cursor = NULL;
info->dbf = data;
Index: php4/ext/dba/dba_dbm.c
diff -u php4/ext/dba/dba_dbm.c:1.21 php4/ext/dba/dba_dbm.c:1.22
--- php4/ext/dba/dba_dbm.c:1.21 Tue Nov 5 23:16:17 2002
+++ php4/ext/dba/dba_dbm.c Wed Nov 6 12:59:03 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_dbm.c,v 1.21 2002/11/06 04:16:17 helly Exp $ */
+/* $Id: dba_dbm.c,v 1.22 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -78,11 +78,8 @@
return FAILURE;
}
- info->dbf = ecalloc(sizeof(dba_dbm_data), 1);
- if (!info->dbf) {
- *error = "Out of memory";
- return FAILURE;
- }
+ info->dbf = emalloc(sizeof(dba_dbm_data));
+ memset(info->dbf, 0, sizeof(dba_dbm_data));
return SUCCESS;
}
Index: php4/ext/dba/dba_flatfile.c
diff -u php4/ext/dba/dba_flatfile.c:1.2 php4/ext/dba/dba_flatfile.c:1.3
--- php4/ext/dba/dba_flatfile.c:1.2 Wed Nov 6 05:43:41 2002
+++ php4/ext/dba/dba_flatfile.c Wed Nov 6 12:59:03 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_flatfile.c,v 1.2 2002/11/06 10:43:41 helly Exp $ */
+/* $Id: dba_flatfile.c,v 1.3 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -68,11 +68,8 @@
int retries = 0;
#endif
- info->dbf = ecalloc(sizeof(flatfile), 1);
- if (!info->dbf) {
- *error = "Out of memory";
- return FAILURE;
- }
+ info->dbf = emalloc(sizeof(flatfile));
+ memset(info->dbf, 0, sizeof(flatfile));
switch(info->mode) {
case DBA_READER:
Index: php4/ext/dba/dba_gdbm.c
diff -u php4/ext/dba/dba_gdbm.c:1.14 php4/ext/dba/dba_gdbm.c:1.15
--- php4/ext/dba/dba_gdbm.c:1.14 Tue Nov 5 14:38:06 2002
+++ php4/ext/dba/dba_gdbm.c Wed Nov 6 12:59:03 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_gdbm.c,v 1.14 2002/11/05 19:38:06 helly Exp $ */
+/* $Id: dba_gdbm.c,v 1.15 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -59,12 +59,8 @@
dbf = gdbm_open(info->path, 0, gmode, filemode, NULL);
if(dbf) {
- info->dbf = ecalloc(sizeof(dba_gdbm_data), 1);
- if (!info->dbf) {
- *error = "Out of memory";
- gdbm_close(dbf);
- return FAILURE;
- }
+ info->dbf = emalloc(sizeof(dba_gdbm_data));
+ memset(info->dbf, 0, sizeof(dba_gdbm_data));
((dba_gdbm_data *) info->dbf)->dbf = dbf;
return SUCCESS;
}
Index: php4/ext/dba/dba_ndbm.c
diff -u php4/ext/dba/dba_ndbm.c:1.13 php4/ext/dba/dba_ndbm.c:1.14
--- php4/ext/dba/dba_ndbm.c:1.13 Tue Nov 5 09:46:36 2002
+++ php4/ext/dba/dba_ndbm.c Wed Nov 6 12:59:03 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_ndbm.c,v 1.13 2002/11/05 14:46:36 helly Exp $ */
+/* $Id: dba_ndbm.c,v 1.14 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -65,12 +65,8 @@
dbf = dbm_open(info->path, gmode, filemode);
- if(dbf) {
- pinfo->dbf = dbf;
- return SUCCESS;
- }
- *error = "Out of memory";
- return FAILURE;
+ pinfo->dbf = dbf;
+ return SUCCESS;
}
DBA_CLOSE_FUNC(ndbm)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
