diff options
Diffstat (limited to 'ext/dba/dba_db3.c')
| -rw-r--r-- | ext/dba/dba_db3.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c index 5e8f1da4ad..746e872726 100644 --- a/ext/dba/dba_db3.c +++ b/ext/dba/dba_db3.c @@ -37,7 +37,7 @@ static void php_dba_db3_errcall_fcn(const char *errpfx, char *msg) { - + php_error_docref(NULL, E_NOTICE, "%s%s", errpfx?errpfx:"", msg); } @@ -68,11 +68,11 @@ DBA_OPEN_FUNC(db3) type = info->mode == DBA_READER ? DB_UNKNOWN : info->mode == DBA_TRUNC ? DB_BTREE : s ? DB_BTREE : DB_UNKNOWN; - + gmode = info->mode == DBA_READER ? DB_RDONLY : - (info->mode == DBA_CREAT && s) ? DB_CREATE : + (info->mode == DBA_CREAT && s) ? DB_CREATE : (info->mode == DBA_CREAT && !s) ? 0 : - info->mode == DBA_WRITER ? 0 : + info->mode == DBA_WRITER ? 0 : info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1; if (gmode == -1) { @@ -97,7 +97,7 @@ DBA_OPEN_FUNC(db3) data->dbp = dbp; data->cursor = NULL; info->dbf = data; - + return SUCCESS; } else { dbp->close(dbp, 0); @@ -113,7 +113,7 @@ DBA_OPEN_FUNC(db3) DBA_CLOSE_FUNC(db3) { DB3_DATA; - + if (dba->cursor) dba->cursor->c_close(dba->cursor); dba->dbp->close(dba->dbp, 0); pefree(dba, info->flags&DBA_PERSISTENT); @@ -125,7 +125,7 @@ DBA_FETCH_FUNC(db3) char *new = NULL; DB3_DATA; DB3_GKEY; - + memset(&gval, 0, sizeof(gval)); if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) { if (newlen) *newlen = gval.size; @@ -139,12 +139,12 @@ DBA_UPDATE_FUNC(db3) DBT gval; DB3_DATA; DB3_GKEY; - + memset(&gval, 0, sizeof(gval)); gval.data = (char *) val; gval.size = vallen; - if (!dba->dbp->put(dba->dbp, NULL, &gkey, &gval, + if (!dba->dbp->put(dba->dbp, NULL, &gkey, &gval, mode == 1 ? DB_NOOVERWRITE : 0)) { return SUCCESS; } @@ -156,7 +156,7 @@ DBA_EXISTS_FUNC(db3) DBT gval; DB3_DATA; DB3_GKEY; - + memset(&gval, 0, sizeof(gval)); if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) { return SUCCESS; @@ -194,7 +194,7 @@ DBA_NEXTKEY_FUNC(db3) DB3_DATA; DBT gkey, gval; char *nkey = NULL; - + memset(&gkey, 0, sizeof(gkey)); memset(&gval, 0, sizeof(gval)); |