Skip to content

Commit 0f20527

Browse files
authored
Simplify configuration getters (#11778)
dom_get_doc_props_read_only() already does a NULL check.
1 parent dbe897b commit 0f20527

File tree

1 file changed

+14
-43
lines changed

1 file changed

+14
-43
lines changed

ext/dom/document.c

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -269,18 +269,13 @@ Since: DOM Level 3
269269
*/
270270
int dom_document_strict_error_checking_read(dom_object *obj, zval *retval)
271271
{
272-
if (obj->document) {
273-
dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
274-
ZVAL_BOOL(retval, doc_prop->stricterror);
275-
} else {
276-
ZVAL_FALSE(retval);
277-
}
272+
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
273+
ZVAL_BOOL(retval, doc_prop->stricterror);
278274
return SUCCESS;
279275
}
280276

281277
int dom_document_strict_error_checking_write(dom_object *obj, zval *newval)
282278
{
283-
284279
if (obj->document) {
285280
dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
286281
doc_prop->stricterror = zend_is_true(newval);
@@ -296,12 +291,8 @@ readonly=no
296291
*/
297292
int dom_document_format_output_read(dom_object *obj, zval *retval)
298293
{
299-
if (obj->document) {
300-
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
301-
ZVAL_BOOL(retval, doc_prop->formatoutput);
302-
} else {
303-
ZVAL_FALSE(retval);
304-
}
294+
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
295+
ZVAL_BOOL(retval, doc_prop->formatoutput);
305296
return SUCCESS;
306297
}
307298

@@ -321,12 +312,8 @@ readonly=no
321312
*/
322313
int dom_document_validate_on_parse_read(dom_object *obj, zval *retval)
323314
{
324-
if (obj->document) {
325-
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
326-
ZVAL_BOOL(retval, doc_prop->validateonparse);
327-
} else {
328-
ZVAL_FALSE(retval);
329-
}
315+
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
316+
ZVAL_BOOL(retval, doc_prop->validateonparse);
330317
return SUCCESS;
331318
}
332319

@@ -346,12 +333,8 @@ readonly=no
346333
*/
347334
int dom_document_resolve_externals_read(dom_object *obj, zval *retval)
348335
{
349-
if (obj->document) {
350-
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
351-
ZVAL_BOOL(retval, doc_prop->resolveexternals);
352-
} else {
353-
ZVAL_FALSE(retval);
354-
}
336+
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
337+
ZVAL_BOOL(retval, doc_prop->resolveexternals);
355338
return SUCCESS;
356339
}
357340

@@ -371,12 +354,8 @@ readonly=no
371354
*/
372355
int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval)
373356
{
374-
if (obj->document) {
375-
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
376-
ZVAL_BOOL(retval, doc_prop->preservewhitespace);
377-
} else {
378-
ZVAL_FALSE(retval);
379-
}
357+
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
358+
ZVAL_BOOL(retval, doc_prop->preservewhitespace);
380359
return SUCCESS;
381360
}
382361

@@ -396,12 +375,8 @@ readonly=no
396375
*/
397376
int dom_document_recover_read(dom_object *obj, zval *retval)
398377
{
399-
if (obj->document) {
400-
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
401-
ZVAL_BOOL(retval, doc_prop->recover);
402-
} else {
403-
ZVAL_FALSE(retval);
404-
}
378+
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
379+
ZVAL_BOOL(retval, doc_prop->recover);
405380
return SUCCESS;
406381
}
407382

@@ -421,12 +396,8 @@ readonly=no
421396
*/
422397
int dom_document_substitue_entities_read(dom_object *obj, zval *retval)
423398
{
424-
if (obj->document) {
425-
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
426-
ZVAL_BOOL(retval, doc_prop->substituteentities);
427-
} else {
428-
ZVAL_FALSE(retval);
429-
}
399+
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
400+
ZVAL_BOOL(retval, doc_prop->substituteentities);
430401
return SUCCESS;
431402
}
432403

0 commit comments

Comments
 (0)