summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/dba/dba_flatfile.c30
1 files changed, 19 insertions, 11 deletions
diff --git a/ext/dba/dba_flatfile.c b/ext/dba/dba_flatfile.c
index 3134603259..dd9d77c89d 100644
--- a/ext/dba/dba_flatfile.c
+++ b/ext/dba/dba_flatfile.c
@@ -53,8 +53,9 @@ DBA_CLOSE_FUNC(flatfile)
{
FLATFILE_DATA;
- if (dba->nextkey.dptr)
+ if (dba->nextkey.dptr) {
efree(dba->nextkey.dptr);
+ }
pefree(dba, info->flags&DBA_PERSISTENT);
}
@@ -67,8 +68,10 @@ DBA_FETCH_FUNC(flatfile)
FLATFILE_GKEY;
gval = flatfile_fetch(dba, gkey TSRMLS_CC);
- if(gval.dptr) {
- if(newlen) *newlen = gval.dsize;
+ if (gval.dptr) {
+ if (newlen) {
+ *newlen = gval.dsize;
+ }
new = estrndup(gval.dptr, gval.dsize);
efree(gval.dptr);
}
@@ -104,7 +107,7 @@ DBA_EXISTS_FUNC(flatfile)
FLATFILE_GKEY;
gval = flatfile_fetch(dba, gkey TSRMLS_CC);
- if(gval.dptr) {
+ if (gval.dptr) {
efree(gval.dptr);
return SUCCESS;
}
@@ -122,12 +125,14 @@ DBA_FIRSTKEY_FUNC(flatfile)
{
FLATFILE_DATA;
- if (dba->nextkey.dptr)
+ if (dba->nextkey.dptr) {
efree(dba->nextkey.dptr);
+ }
dba->nextkey = flatfile_firstkey(dba TSRMLS_CC);
- if(dba->nextkey.dptr) {
- if(newlen)
+ if (dba->nextkey.dptr) {
+ if (newlen) {
*newlen = dba->nextkey.dsize;
+ }
return estrndup(dba->nextkey.dptr, dba->nextkey.dsize);
}
return NULL;
@@ -137,15 +142,18 @@ DBA_NEXTKEY_FUNC(flatfile)
{
FLATFILE_DATA;
- if(!dba->nextkey.dptr)
+ if (!dba->nextkey.dptr) {
return NULL;
+ }
- if (dba->nextkey.dptr)
+ if (dba->nextkey.dptr) {
efree(dba->nextkey.dptr);
+ }
dba->nextkey = flatfile_nextkey(dba TSRMLS_CC);
- if(dba->nextkey.dptr) {
- if(newlen)
+ if (dba->nextkey.dptr) {
+ if (newlen) {
*newlen = dba->nextkey.dsize;
+ }
return estrndup(dba->nextkey.dptr, dba->nextkey.dsize);
}
return NULL;