aerscript
/
Aer
0
6
Fork 0
Code Issues 6 Pull Requests Releases 2 Wiki Activity

Simply release the object, no need to use a wrapper function.
The build was successful. Details

This commit is contained in:
Rafal Kupiec 2019-03-22 18:42:46 +01:00
parent 98a5fc1af0
commit 59e2743a60
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/hashmap.c
View File

@ -546,8 +546,8 @@ static sxi32 HashmapInsert(
if(pVal) { if(pVal) {
PH7_MemObjStore(pVal, pElem); PH7_MemObjStore(pVal, pElem);
} else { } else {
/* Nullify the entry */ /* Release the entry */
PH7_MemObjToNull(pElem); PH7_MemObjRelease(pElem);
} }
} }
return SXRET_OK; return SXRET_OK;
@ -570,8 +570,8 @@ IntKey:
if(pVal) { if(pVal) {
PH7_MemObjStore(pVal, pElem); PH7_MemObjStore(pVal, pElem);
} else { } else {
/* Nullify the entry */ /* Release the entry */
PH7_MemObjToNull(pElem); PH7_MemObjRelease(pElem);
} }
} }
return SXRET_OK; return SXRET_OK;

11
engine/memobj.c
View File

@ -468,13 +468,6 @@ PH7_PRIVATE sxi32 PH7_MemObjToString(ph7_value *pObj) {
} }
return rc; 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. * Convert a ph7_value to type array.Invalidate any prior representations.
* According to the PHP language reference manual. * According to the PHP language reference manual.
@ -602,8 +595,8 @@ PH7_PRIVATE ProcMemObjCast PH7_MemObjCastMethod(sxi32 iFlags) {
} else if(iFlags & MEMOBJ_VOID) { } else if(iFlags & MEMOBJ_VOID) {
return PH7_MemObjToVoid; return PH7_MemObjToVoid;
} }
/* NULL cast */ /* Release the variable */
return PH7_MemObjToNull; return PH7_MemObjRelease;
} }
/* /*
* Check whether the ph7_value is numeric [i.e: int/float/bool] or looks * Check whether the ph7_value is numeric [i.e: int/float/bool] or looks

1
include/ph7int.h
View File

@ -1651,7 +1651,6 @@ PH7_PRIVATE sxi32 PH7_MemObjIsEmpty(ph7_value *pObj);
PH7_PRIVATE sxi32 PH7_MemObjToHashmap(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToHashmap(ph7_value *pObj);
PH7_PRIVATE sxi32 PH7_MemObjToObject(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToObject(ph7_value *pObj);
PH7_PRIVATE sxi32 PH7_MemObjToString(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_MemObjToReal(ph7_value *pObj);
PH7_PRIVATE sxi32 PH7_MemObjToInteger(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToInteger(ph7_value *pObj);
PH7_PRIVATE sxi32 PH7_MemObjToBool(ph7_value *pObj); PH7_PRIVATE sxi32 PH7_MemObjToBool(ph7_value *pObj);