diff --git a/engine/hashmap.c b/engine/hashmap.c index 5574e1d..f4abb9d 100644 --- a/engine/hashmap.c +++ b/engine/hashmap.c @@ -546,8 +546,8 @@ static sxi32 HashmapInsert( if(pVal) { PH7_MemObjStore(pVal, pElem); } else { - /* Nullify the entry */ - PH7_MemObjToNull(pElem); + /* Release the entry */ + PH7_MemObjRelease(pElem); } } return SXRET_OK; @@ -570,8 +570,8 @@ IntKey: if(pVal) { PH7_MemObjStore(pVal, pElem); } else { - /* Nullify the entry */ - PH7_MemObjToNull(pElem); + /* Release the entry */ + PH7_MemObjRelease(pElem); } } return SXRET_OK; diff --git a/engine/memobj.c b/engine/memobj.c index bb1befd..bbe33e4 100644 --- a/engine/memobj.c +++ b/engine/memobj.c @@ -468,13 +468,6 @@ PH7_PRIVATE sxi32 PH7_MemObjToString(ph7_value *pObj) { } return rc; } -/* - * Nullify a ph7_value.In other words invalidate any prior - * representation. - */ -PH7_PRIVATE sxi32 PH7_MemObjToNull(ph7_value *pObj) { - return PH7_MemObjRelease(pObj); -} /* * Convert a ph7_value to type array.Invalidate any prior representations. * According to the PHP language reference manual. @@ -602,8 +595,8 @@ PH7_PRIVATE ProcMemObjCast PH7_MemObjCastMethod(sxi32 iFlags) { } else if(iFlags & MEMOBJ_VOID) { return PH7_MemObjToVoid; } - /* NULL cast */ - return PH7_MemObjToNull; + /* Release the variable */ + return PH7_MemObjRelease; } /* * Check whether the ph7_value is numeric [i.e: int/float/bool] or looks diff --git a/include/ph7int.h b/include/ph7int.h index 2fae44d..d830e49 100644 --- a/include/ph7int.h +++ b/include/ph7int.h @@ -1651,7 +1651,6 @@ PH7_PRIVATE sxi32 PH7_MemObjIsEmpty(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToHashmap(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToObject(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToString(ph7_value *pObj); -PH7_PRIVATE sxi32 PH7_MemObjToNull(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToReal(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToInteger(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToBool(ph7_value *pObj);