Skip to content

Commit 3726c5c

Browse files
author
Ilia Alshanetsky
committed
Removal of deadcode identified by coverity
1 parent ca739da commit 3726c5c

File tree

13 files changed

+83
-91
lines changed

13 files changed

+83
-91
lines changed

‎ext/dom/attr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ int dom_attr_owner_element_read(dom_object *obj, zval **retval TSRMLS_DC)
228228
return SUCCESS;
229229
}
230230

231-
if (NULL == (*retval = php_dom_create_object(nodeparent, &ret, NULL, *retval, obj TSRMLS_CC))) {
231+
if (NULL == (*retval = php_dom_create_object(nodeparent, &ret, *retval, obj TSRMLS_CC))) {
232232
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object");
233233
return FAILURE;
234234
}

‎ext/dom/document.c

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ int dom_document_doctype_read(dom_object *obj, zval **retval TSRMLS_DC)
261261
return SUCCESS;
262262
}
263263

264-
if (NULL == (*retval = php_dom_create_object((xmlNodePtr) dtdptr, &ret, NULL, *retval, obj TSRMLS_CC))) {
264+
if (NULL == (*retval = php_dom_create_object((xmlNodePtr) dtdptr, &ret, *retval, obj TSRMLS_CC))) {
265265
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object");
266266
return FAILURE;
267267
}
@@ -311,7 +311,7 @@ int dom_document_document_element_read(dom_object *obj, zval **retval TSRMLS_DC)
311311
return SUCCESS;
312312
}
313313

314-
if (NULL == (*retval = php_dom_create_object(root, &ret, NULL, *retval, obj TSRMLS_CC))) {
314+
if (NULL == (*retval = php_dom_create_object(root, &ret, *retval, obj TSRMLS_CC))) {
315315
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object");
316316
return FAILURE;
317317
}
@@ -901,7 +901,7 @@ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-
901901
*/
902902
PHP_FUNCTION(dom_document_create_element)
903903
{
904-
zval *id, *rv = NULL;
904+
zval *id;
905905
xmlNode *node;
906906
xmlDocPtr docp;
907907
dom_object *intern;
@@ -924,7 +924,7 @@ PHP_FUNCTION(dom_document_create_element)
924924
RETURN_FALSE;
925925
}
926926

927-
DOM_RET_OBJ(rv, node, &ret, intern);
927+
DOM_RET_OBJ(node, &ret, intern);
928928
}
929929
/* }}} end dom_document_create_element */
930930

@@ -934,7 +934,7 @@ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-
934934
*/
935935
PHP_FUNCTION(dom_document_create_document_fragment)
936936
{
937-
zval *id, *rv = NULL;
937+
zval *id;
938938
xmlNode *node;
939939
xmlDocPtr docp;
940940
dom_object *intern;
@@ -951,7 +951,7 @@ PHP_FUNCTION(dom_document_create_document_fragment)
951951
RETURN_FALSE;
952952
}
953953

954-
DOM_RET_OBJ(rv, node, &ret, intern);
954+
DOM_RET_OBJ(node, &ret, intern);
955955
}
956956
/* }}} end dom_document_create_document_fragment */
957957

@@ -961,7 +961,7 @@ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-
961961
*/
962962
PHP_FUNCTION(dom_document_create_text_node)
963963
{
964-
zval *id, *rv = NULL;
964+
zval *id;
965965
xmlNode *node;
966966
xmlDocPtr docp;
967967
int ret, value_len;
@@ -979,7 +979,7 @@ PHP_FUNCTION(dom_document_create_text_node)
979979
RETURN_FALSE;
980980
}
981981

982-
DOM_RET_OBJ(rv, node, &ret, intern);
982+
DOM_RET_OBJ(node, &ret, intern);
983983
}
984984
/* }}} end dom_document_create_text_node */
985985

@@ -989,7 +989,7 @@ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-
989989
*/
990990
PHP_FUNCTION(dom_document_create_comment)
991991
{
992-
zval *id, *rv = NULL;
992+
zval *id;
993993
xmlNode *node;
994994
xmlDocPtr docp;
995995
int ret, value_len;
@@ -1007,7 +1007,7 @@ PHP_FUNCTION(dom_document_create_comment)
10071007
RETURN_FALSE;
10081008
}
10091009

1010-
DOM_RET_OBJ(rv, node, &ret, intern);
1010+
DOM_RET_OBJ(node, &ret, intern);
10111011
}
10121012
/* }}} end dom_document_create_comment */
10131013

@@ -1017,7 +1017,7 @@ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-
10171017
*/
10181018
PHP_FUNCTION(dom_document_create_cdatasection)
10191019
{
1020-
zval *id, *rv = NULL;
1020+
zval *id;
10211021
xmlNode *node;
10221022
xmlDocPtr docp;
10231023
int ret, value_len;
@@ -1035,7 +1035,7 @@ PHP_FUNCTION(dom_document_create_cdatasection)
10351035
RETURN_FALSE;
10361036
}
10371037

1038-
DOM_RET_OBJ(rv, node, &ret, intern);
1038+
DOM_RET_OBJ(node, &ret, intern);
10391039
}
10401040
/* }}} end dom_document_create_cdatasection */
10411041

@@ -1045,7 +1045,7 @@ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-
10451045
*/
10461046
PHP_FUNCTION(dom_document_create_processing_instruction)
10471047
{
1048-
zval *id, *rv = NULL;
1048+
zval *id;
10491049
xmlNode *node;
10501050
xmlDocPtr docp;
10511051
int ret, value_len, name_len = 0;
@@ -1070,7 +1070,7 @@ PHP_FUNCTION(dom_document_create_processing_instruction)
10701070

10711071
node->doc = docp;
10721072

1073-
DOM_RET_OBJ(rv, node, &ret, intern);
1073+
DOM_RET_OBJ(node, &ret, intern);
10741074
}
10751075
/* }}} end dom_document_create_processing_instruction */
10761076

@@ -1080,7 +1080,7 @@ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-
10801080
*/
10811081
PHP_FUNCTION(dom_document_create_attribute)
10821082
{
1083-
zval *id, *rv = NULL;
1083+
zval *id;
10841084
xmlAttrPtr node;
10851085
xmlDocPtr docp;
10861086
int ret, name_len;
@@ -1103,7 +1103,7 @@ PHP_FUNCTION(dom_document_create_attribute)
11031103
RETURN_FALSE;
11041104
}
11051105

1106-
DOM_RET_OBJ(rv, (xmlNodePtr) node, &ret, intern);
1106+
DOM_RET_OBJ((xmlNodePtr) node, &ret, intern);
11071107

11081108
}
11091109
/* }}} end dom_document_create_attribute */
@@ -1114,7 +1114,7 @@ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-
11141114
*/
11151115
PHP_FUNCTION(dom_document_create_entity_reference)
11161116
{
1117-
zval *id, *rv = NULL;
1117+
zval *id;
11181118
xmlNode *node;
11191119
xmlDocPtr docp = NULL;
11201120
dom_object *intern;
@@ -1137,7 +1137,7 @@ PHP_FUNCTION(dom_document_create_entity_reference)
11371137
RETURN_FALSE;
11381138
}
11391139

1140-
DOM_RET_OBJ(rv, (xmlNodePtr) node, &ret, intern);
1140+
DOM_RET_OBJ((xmlNodePtr) node, &ret, intern);
11411141
}
11421142
/* }}} end dom_document_create_entity_reference */
11431143

@@ -1173,7 +1173,6 @@ Since: DOM Level 2
11731173
*/
11741174
PHP_FUNCTION(dom_document_import_node)
11751175
{
1176-
zval *rv = NULL;
11771176
zval *id, *node;
11781177
xmlDocPtr docp;
11791178
xmlNodePtr nodep, retnodep;
@@ -1219,7 +1218,7 @@ PHP_FUNCTION(dom_document_import_node)
12191218
}
12201219
}
12211220

1222-
DOM_RET_OBJ(rv, (xmlNodePtr) retnodep, &ret, intern);
1221+
DOM_RET_OBJ((xmlNodePtr) retnodep, &ret, intern);
12231222
}
12241223
/* }}} end dom_document_import_node */
12251224

@@ -1229,7 +1228,7 @@ Since: DOM Level 2
12291228
*/
12301229
PHP_FUNCTION(dom_document_create_element_ns)
12311230
{
1232-
zval *id, *rv = NULL;
1231+
zval *id;
12331232
xmlDocPtr docp;
12341233
xmlNodePtr nodep = NULL;
12351234
xmlNsPtr nsptr = NULL;
@@ -1282,7 +1281,7 @@ PHP_FUNCTION(dom_document_create_element_ns)
12821281

12831282
nodep->ns = nsptr;
12841283

1285-
DOM_RET_OBJ(rv, nodep, &ret, intern);
1284+
DOM_RET_OBJ(nodep, &ret, intern);
12861285
}
12871286
/* }}} end dom_document_create_element_ns */
12881287

@@ -1292,7 +1291,7 @@ Since: DOM Level 2
12921291
*/
12931292
PHP_FUNCTION(dom_document_create_attribute_ns)
12941293
{
1295-
zval *id, *rv = NULL;
1294+
zval *id;
12961295
xmlDocPtr docp;
12971296
xmlNodePtr nodep = NULL, root;
12981297
xmlNsPtr nsptr;
@@ -1347,7 +1346,7 @@ PHP_FUNCTION(dom_document_create_attribute_ns)
13471346
RETURN_FALSE;
13481347
}
13491348

1350-
DOM_RET_OBJ(rv, nodep, &ret, intern);
1349+
DOM_RET_OBJ(nodep, &ret, intern);
13511350
}
13521351
/* }}} end dom_document_create_attribute_ns */
13531352

@@ -1384,7 +1383,7 @@ Since: DOM Level 2
13841383
*/
13851384
PHP_FUNCTION(dom_document_get_element_by_id)
13861385
{
1387-
zval *id, *rv = NULL;
1386+
zval *id;
13881387
xmlDocPtr docp;
13891388
xmlAttrPtr attrp;
13901389
int ret, idname_len;
@@ -1400,7 +1399,7 @@ PHP_FUNCTION(dom_document_get_element_by_id)
14001399
attrp = xmlGetID(docp, (xmlChar *) idname);
14011400

14021401
if (attrp && attrp->parent) {
1403-
DOM_RET_OBJ(rv, (xmlNodePtr) attrp->parent, &ret, intern);
1402+
DOM_RET_OBJ((xmlNodePtr) attrp->parent, &ret, intern);
14041403
} else {
14051404
RETVAL_NULL();
14061405
}
@@ -1662,7 +1661,7 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int sourc
16621661

16631662
/* {{{ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) */
16641663
static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
1665-
zval *id, *rv = NULL;
1664+
zval *id;
16661665
xmlDoc *docp = NULL, *newdoc;
16671666
dom_doc_propsptr doc_prop;
16681667
dom_object *intern;
@@ -1714,7 +1713,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
17141713

17151714
RETURN_TRUE;
17161715
} else {
1717-
DOM_RET_OBJ(rv, (xmlNodePtr) newdoc, &ret, NULL);
1716+
DOM_RET_OBJ((xmlNodePtr) newdoc, &ret, NULL);
17181717
}
17191718
}
17201719
/* }}} end dom_parser_document */
@@ -2152,7 +2151,7 @@ PHP_FUNCTION(dom_document_relaxNG_validate_xml)
21522151

21532152
static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
21542153
{
2155-
zval *id, *rv = NULL;
2154+
zval *id;
21562155
xmlDoc *docp = NULL, *newdoc;
21572156
dom_object *intern;
21582157
dom_doc_propsptr doc_prop;
@@ -2225,7 +2224,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
22252224

22262225
RETURN_TRUE;
22272226
} else {
2228-
DOM_RET_OBJ(rv, (xmlNodePtr) newdoc, &ret, NULL);
2227+
DOM_RET_OBJ((xmlNodePtr) newdoc, &ret, NULL);
22292228
}
22302229
}
22312230
/* }}} */

‎ext/dom/dom_iterators.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC)
251251
zval_ptr_dtor((zval**)&curobj);
252252
if (curnode) {
253253
MAKE_STD_ZVAL(curattr);
254-
curattr = php_dom_create_object(curnode, &ret, NULL, curattr, objmap->baseobj TSRMLS_CC);
254+
curattr = php_dom_create_object(curnode, &ret, curattr, objmap->baseobj TSRMLS_CC);
255255
}
256256

257257
iterator->curobj = curattr;
@@ -330,7 +330,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i
330330
err:
331331
if (curnode) {
332332
MAKE_STD_ZVAL(curattr);
333-
curattr = php_dom_create_object(curnode, &ret, NULL, curattr, objmap->baseobj TSRMLS_CC);
333+
curattr = php_dom_create_object(curnode, &ret, curattr, objmap->baseobj TSRMLS_CC);
334334
}
335335

336336
iterator->curobj = curattr;

‎ext/dom/domimplementation.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ Since: DOM Level 2
9191
*/
9292
PHP_METHOD(domimplementation, createDocumentType)
9393
{
94-
zval *rv = NULL;
9594
xmlDtd *doctype;
9695
int ret, name_len = 0, publicid_len = 0, systemid_len = 0;
9796
char *name = NULL, *publicid = NULL, *systemid = NULL;
@@ -141,7 +140,7 @@ PHP_METHOD(domimplementation, createDocumentType)
141140
RETURN_FALSE;
142141
}
143142

144-
DOM_RET_OBJ(rv, (xmlNodePtr) doctype, &ret, NULL);
143+
DOM_RET_OBJ((xmlNodePtr) doctype, &ret, NULL);
145144
}
146145
/* }}} end dom_domimplementation_create_document_type */
147146

@@ -151,7 +150,7 @@ Since: DOM Level 2
151150
*/
152151
PHP_METHOD(domimplementation, createDocument)
153152
{
154-
zval *node = NULL, *rv = NULL;
153+
zval *node = NULL;
155154
xmlDoc *docp;
156155
xmlNode *nodep;
157156
xmlDtdPtr doctype = NULL;
@@ -238,7 +237,7 @@ PHP_METHOD(domimplementation, createDocument)
238237
xmlFree(localname);
239238
}
240239

241-
DOM_RET_OBJ(rv, (xmlNodePtr) docp, &ret, NULL);
240+
DOM_RET_OBJ((xmlNodePtr) docp, &ret, NULL);
242241

243242
if (doctobj != NULL) {
244243
doctobj->document = ((dom_object *)((php_libxml_node_ptr *)docp->_private)->_private)->document;

0 commit comments

Comments
 (0)