diff options
| author | Marcus Boerger <helly@php.net> | 2005-02-26 02:06:49 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2005-02-26 02:06:49 +0000 |
| commit | ec2babc448a1802f00b991d0587038cb710c34e7 (patch) | |
| tree | cd50c462d85f99ad16666e5de7841e9a4bd0867d /ext/dba | |
| parent | 4e66bbdfb74a6483db199b696e2590885bf17171 (diff) | |
| download | php-git-ec2babc448a1802f00b991d0587038cb710c34e7.tar.gz | |
- Simplify
Diffstat (limited to 'ext/dba')
| -rwxr-xr-x | ext/dba/dba_db1.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/ext/dba/dba_db1.c b/ext/dba/dba_db1.c index d81cfb6fc2..dff405fa70 100755 --- a/ext/dba/dba_db1.c +++ b/ext/dba/dba_db1.c @@ -31,7 +31,6 @@ #include DB1_INCLUDE_FILE #endif -#include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -101,14 +100,12 @@ DBA_FETCH_FUNC(db1) DB1_DATA; DB1_GKEY; - char *new = NULL; - memset(&gval, 0, sizeof(gval)); if (dba->dbp->get(dba->dbp, &gkey, &gval, 0) == RET_SUCCESS) { if (newlen) *newlen = gval.size; - new = estrndup(gval.data, gval.size); + return estrndup(gval.data, gval.size); } - return new; + return NULL; } DBA_UPDATE_FUNC(db1) @@ -146,17 +143,14 @@ DBA_FIRSTKEY_FUNC(db1) DBT gval; DB1_DATA; - char *key = NULL; - memset(&gkey, 0, sizeof(gkey)); memset(&gval, 0, sizeof(gval)); if (dba->dbp->seq(dba->dbp, &gkey, &gval, R_FIRST) == RET_SUCCESS) { if (newlen) *newlen = gkey.size; - key = estrndup(gkey.data, gkey.size); + return estrndup(gkey.data, gkey.size); } - - return key; + return NULL; } DBA_NEXTKEY_FUNC(db1) @@ -165,16 +159,14 @@ DBA_NEXTKEY_FUNC(db1) DBT gval; DB1_DATA; - char *key = NULL; - memset(&gkey, 0, sizeof(gkey)); memset(&gval, 0, sizeof(gval)); if (dba->dbp->seq(dba->dbp, &gkey, &gval, R_NEXT) == RET_SUCCESS) { if (newlen) *newlen = gkey.size; - key = estrndup(gkey.data, gkey.size); + return estrndup(gkey.data, gkey.size); } - return key; + return NULL; } DBA_OPTIMIZE_FUNC(db1) |