mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
use ecmalloc/efree functions instead of (c|m)alloc/free
This commit is contained in:
@@ -75,7 +75,7 @@ DBA_OPEN_FUNC(db2)
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
info->dbf = calloc(sizeof(dba_db2_data), 1);
|
||||
info->dbf = ecalloc(sizeof(dba_db2_data), 1);
|
||||
((dba_db2_data *) info->dbf)->dbp = dbp;
|
||||
return SUCCESS;
|
||||
}
|
||||
@@ -87,7 +87,7 @@ DBA_CLOSE_FUNC(db2)
|
||||
if (dba->cursor)
|
||||
dba->cursor->c_close(dba->cursor);
|
||||
dba->dbp->close(dba->dbp, 0);
|
||||
free(dba);
|
||||
efree(dba);
|
||||
}
|
||||
|
||||
DBA_FETCH_FUNC(db2)
|
||||
|
||||
@@ -77,7 +77,7 @@ DBA_OPEN_FUNC(db3)
|
||||
dbp->open(dbp, info->path, NULL, type, gmode, filemode) == 0) {
|
||||
dba_db3_data *data;
|
||||
|
||||
data = malloc(sizeof(*data));
|
||||
data = emalloc(sizeof(*data));
|
||||
data->dbp = dbp;
|
||||
data->cursor = NULL;
|
||||
info->dbf = data;
|
||||
@@ -96,7 +96,7 @@ DBA_CLOSE_FUNC(db3)
|
||||
|
||||
if (dba->cursor) dba->cursor->c_close(dba->cursor);
|
||||
dba->dbp->close(dba->dbp, 0);
|
||||
free(dba);
|
||||
efree(dba);
|
||||
}
|
||||
|
||||
DBA_FETCH_FUNC(db3)
|
||||
|
||||
@@ -78,13 +78,13 @@ DBA_OPEN_FUNC(dbm)
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
info->dbf = calloc(sizeof(dba_dbm_data), 1);
|
||||
info->dbf = ecalloc(sizeof(dba_dbm_data), 1);
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
DBA_CLOSE_FUNC(dbm)
|
||||
{
|
||||
free(info->dbf);
|
||||
efree(info->dbf);
|
||||
dbmclose();
|
||||
}
|
||||
|
||||
|
||||
@@ -59,8 +59,7 @@ DBA_OPEN_FUNC(gdbm)
|
||||
dbf = gdbm_open(info->path, 0, gmode, filemode, NULL);
|
||||
|
||||
if(dbf) {
|
||||
info->dbf = malloc(sizeof(dba_gdbm_data));
|
||||
memset(info->dbf, 0, sizeof(dba_gdbm_data));
|
||||
info->dbf = ecalloc(sizeof(dba_gdbm_data), 1);
|
||||
((dba_gdbm_data *) info->dbf)->dbf = dbf;
|
||||
return SUCCESS;
|
||||
}
|
||||
@@ -73,7 +72,7 @@ DBA_CLOSE_FUNC(gdbm)
|
||||
|
||||
if(dba->nextkey.dptr) free(dba->nextkey.dptr);
|
||||
gdbm_close(dba->dbf);
|
||||
free(dba);
|
||||
efree(dba);
|
||||
}
|
||||
|
||||
DBA_FETCH_FUNC(gdbm)
|
||||
|
||||
Reference in New Issue
Block a user