Fix [-Wduplicated-cond] in SOAP extension

Girgias · Girgias · commit 302ada3e8fca · 2020-09-24T00:16:10.000+01:00
diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c
@@ -1612,8 +1612,6 @@ static int schema_element(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr element, sdlTyp
 	attr = get_attribute(attrs, "default");
 	if (attr) {
 		if (ref != NULL) {
-			soap_error0(E_ERROR, "Parsing Schema: element has both 'ref' and 'fixed' attributes");
-		} else if (ref != NULL) {
 			soap_error0(E_ERROR, "Parsing Schema: element has both 'default' and 'fixed' attributes");
 		}
 		cur_type->def = estrdup((char*)attr->children->content);

Original file line number	Diff line number	Diff line change
`@@ -1612,8 +1612,6 @@ static int schema_element(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr element, sdlTyp`
`1612`	`1612`	`attr = get_attribute(attrs, "default");`
`1613`	`1613`	`if (attr) {`
`1614`	`1614`	`if (ref != NULL) {`
`1615`		`- soap_error0(E_ERROR, "Parsing Schema: element has both 'ref' and 'fixed' attributes");`
`1616`		`- } else if (ref != NULL) {`
`1617`	`1615`	`soap_error0(E_ERROR, "Parsing Schema: element has both 'default' and 'fixed' attributes");`
`1618`	`1616`	`}`
`1619`	`1617`	`cur_type->def = estrdup((char*)attr->children->content);`