Skip to content

Commit 2505781

Browse files
committed
ext/tidy: Use RETURN_BOOL() where possible
1 parent bf3d7d1 commit 2505781

File tree

1 file changed

+8
-40
lines changed

1 file changed

+8
-40
lines changed

ext/tidy/tidy.c

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,11 +1330,7 @@ PHP_FUNCTION(tidy_getopt)
13301330
break;
13311331

13321332
case TidyBoolean:
1333-
if (optval) {
1334-
RETURN_TRUE;
1335-
} else {
1336-
RETURN_FALSE;
1337-
}
1333+
RETURN_BOOL(optval);
13381334
break;
13391335

13401336
default:
@@ -1488,11 +1484,7 @@ PHP_METHOD(tidyNode, hasChildren)
14881484
{
14891485
TIDY_FETCH_ONLY_OBJECT;
14901486

1491-
if (tidyGetChild(obj->node)) {
1492-
RETURN_TRUE;
1493-
} else {
1494-
RETURN_FALSE;
1495-
}
1487+
RETURN_BOOL(tidyGetChild(obj->node));
14961488
}
14971489
/* }}} */
14981490

@@ -1501,11 +1493,7 @@ PHP_METHOD(tidyNode, hasSiblings)
15011493
{
15021494
TIDY_FETCH_ONLY_OBJECT;
15031495

1504-
if (obj->node && tidyGetNext(obj->node)) {
1505-
RETURN_TRUE;
1506-
} else {
1507-
RETURN_FALSE;
1508-
}
1496+
RETURN_BOOL(obj->node && tidyGetNext(obj->node));
15091497
}
15101498
/* }}} */
15111499

@@ -1514,11 +1502,7 @@ PHP_METHOD(tidyNode, isComment)
15141502
{
15151503
TIDY_FETCH_ONLY_OBJECT;
15161504

1517-
if (tidyNodeGetType(obj->node) == TidyNode_Comment) {
1518-
RETURN_TRUE;
1519-
} else {
1520-
RETURN_FALSE;
1521-
}
1505+
RETURN_BOOL(tidyNodeGetType(obj->node) == TidyNode_Comment);
15221506
}
15231507
/* }}} */
15241508

@@ -1543,11 +1527,7 @@ PHP_METHOD(tidyNode, isText)
15431527
{
15441528
TIDY_FETCH_ONLY_OBJECT;
15451529

1546-
if (tidyNodeGetType(obj->node) == TidyNode_Text) {
1547-
RETURN_TRUE;
1548-
} else {
1549-
RETURN_FALSE;
1550-
}
1530+
RETURN_BOOL(tidyNodeGetType(obj->node) == TidyNode_Text);
15511531
}
15521532
/* }}} */
15531533

@@ -1556,11 +1536,7 @@ PHP_METHOD(tidyNode, isJste)
15561536
{
15571537
TIDY_FETCH_ONLY_OBJECT;
15581538

1559-
if (tidyNodeGetType(obj->node) == TidyNode_Jste) {
1560-
RETURN_TRUE;
1561-
} else {
1562-
RETURN_FALSE;
1563-
}
1539+
RETURN_BOOL(tidyNodeGetType(obj->node) == TidyNode_Jste);
15641540
}
15651541
/* }}} */
15661542

@@ -1569,11 +1545,7 @@ PHP_METHOD(tidyNode, isAsp)
15691545
{
15701546
TIDY_FETCH_ONLY_OBJECT;
15711547

1572-
if (tidyNodeGetType(obj->node) == TidyNode_Asp) {
1573-
RETURN_TRUE;
1574-
} else {
1575-
RETURN_FALSE;
1576-
}
1548+
RETURN_BOOL(tidyNodeGetType(obj->node) == TidyNode_Asp);
15771549
}
15781550
/* }}} */
15791551

@@ -1582,11 +1554,7 @@ PHP_METHOD(tidyNode, isPhp)
15821554
{
15831555
TIDY_FETCH_ONLY_OBJECT;
15841556

1585-
if (tidyNodeGetType(obj->node) == TidyNode_Php) {
1586-
RETURN_TRUE;
1587-
} else {
1588-
RETURN_FALSE;
1589-
}
1557+
RETURN_BOOL(tidyNodeGetType(obj->node) == TidyNode_Php);
15901558
}
15911559
/* }}} */
15921560

0 commit comments

Comments
 (0)