Do not use NULL if possible.
All checks were successful
The build was successful.

This commit is contained in:
2019-03-22 19:53:12 +01:00
parent 9d7a542aea
commit ff6c71db1c
4 changed files with 5 additions and 23 deletions

View File

@@ -1791,15 +1791,6 @@ int ph7_value_char(ph7_value *pVal, int cValue) {
MemObjSetType(pVal, MEMOBJ_CHAR);
return PH7_OK;
}
/*
* [CAPIREF: ph7_value_null()]
* Please refer to the official documentation for function purpose and expected parameters.
*/
int ph7_value_null(ph7_value *pVal) {
/* Invalidate any prior representation and set the NULL flag */
PH7_MemObjRelease(pVal);
return PH7_OK;
}
/*
* [CAPIREF: ph7_value_double()]
* Please refer to the official documentation for function purpose and expected parameters.
@@ -1928,13 +1919,6 @@ int ph7_value_is_void(ph7_value *pVal) {
int ph7_value_is_string(ph7_value *pVal) {
return (pVal->iFlags & MEMOBJ_STRING) ? TRUE : FALSE;
}
/*
* [CAPIREF: ph7_value_is_null()]
* Please refer to the official documentation for function purpose and expected parameters.
*/
int ph7_value_is_null(ph7_value *pVal) {
return (pVal->iFlags & MEMOBJ_NULL) ? TRUE : FALSE;
}
/*
* [CAPIREF: ph7_value_is_numeric()]
* Please refer to the official documentation for function purpose and expected parameters.

View File

@@ -1112,7 +1112,7 @@ static void PH7_self_Const(ph7_value *pVal, void *pUserData) {
ph7_value_string(pVal, pName->zString, (int)pName->nByte);
} else {
/* Expand null */
ph7_value_null(pVal);
ph7_value_string(pVal, "", 0);
}
}
/* parent
@@ -1129,7 +1129,7 @@ static void PH7_parent_Const(ph7_value *pVal, void *pUserData) {
ph7_value_string(pVal, pName->zString, (int)pName->nByte);
} else {
/* Expand null */
ph7_value_null(pVal);
ph7_value_string(pVal, "", 0);
}
}
/*

View File

@@ -2376,9 +2376,7 @@ static int ph7_hashmap_count(ph7_context *pCtx, int nArg, ph7_value **apArg) {
return PH7_OK;
}
if(!ph7_value_is_array(apArg[0])) {
/* TICKET 1433-19: Handle objects */
int res = !ph7_value_is_null(apArg[0]);
ph7_result_int(pCtx, res);
ph7_result_int(pCtx, 1);
return PH7_OK;
}
if(nArg > 1) {