rasmus Fri, 03 Sep 2010 22:24:08 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=303034
Log: This incorrect contraction started to get on my eyes after I saw it for the 87th time while struggling with an annoying SOAP service. Changed paths: U php/php-src/branches/PHP_5_3/ext/soap/php_encoding.c U php/php-src/branches/PHP_5_3/ext/soap/php_packet_soap.c U php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c U php/php-src/trunk/ext/soap/php_encoding.c U php/php-src/trunk/ext/soap/php_packet_soap.c U php/php-src/trunk/ext/soap/php_sdl.c Modified: php/php-src/branches/PHP_5_3/ext/soap/php_encoding.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/soap/php_encoding.c 2010-09-03 19:40:04 UTC (rev 303033) +++ php/php-src/branches/PHP_5_3/ext/soap/php_encoding.c 2010-09-03 22:24:08 UTC (rev 303034) @@ -373,7 +373,7 @@ HashTable *ht = Z_OBJPROP_P(data); if (zend_hash_find(ht, "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) { - soap_error0(E_ERROR, "Encoding: SoapVar hasn't 'enc_type' property"); + soap_error0(E_ERROR, "Encoding: SoapVar has no 'enc_type' property"); } if (zend_hash_find(ht, "enc_stype", sizeof("enc_stype"), (void **)&zstype) == SUCCESS) { @@ -1751,7 +1751,7 @@ return 2; } else { if (strict) { - soap_error1(E_ERROR, "Encoding: object hasn't '%s' property", model->u.element->name); + soap_error1(E_ERROR, "Encoding: object has no '%s' property", model->u.element->name); } return 0; } @@ -1784,7 +1784,7 @@ return 2; } else { if (strict) { - soap_error0(E_ERROR, "Encoding: object hasn't 'any' property"); + soap_error0(E_ERROR, "Encoding: object has no 'any' property"); } return 0; } @@ -3632,7 +3632,7 @@ zval **ztype; if (zend_hash_find(Z_OBJPROP_PP(tmp), "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) { - soap_error0(E_ERROR, "Encoding: SoapVar hasn't 'enc_type' property"); + soap_error0(E_ERROR, "Encoding: SoapVar has no 'enc_type' property"); } cur_type = Z_LVAL_PP(ztype); Modified: php/php-src/branches/PHP_5_3/ext/soap/php_packet_soap.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/soap/php_packet_soap.c 2010-09-03 19:40:04 UTC (rev 303033) +++ php/php-src/branches/PHP_5_3/ext/soap/php_packet_soap.c 2010-09-03 22:24:08 UTC (rev 303034) @@ -340,7 +340,7 @@ } } } else { - /* Function hasn't WSDL description */ + /* Function has no WSDL description */ xmlNodePtr val; val = resp->children; while (val != NULL) { Modified: php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c 2010-09-03 19:40:04 UTC (rev 303033) +++ php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c 2010-09-03 22:24:08 UTC (rev 303034) @@ -373,7 +373,7 @@ soap_error1(E_ERROR, "Parsing WSDL: <message> '%s' already defined", name->children->content); } } else { - soap_error0(E_ERROR, "Parsing WSDL: <message> hasn't name attribute"); + soap_error0(E_ERROR, "Parsing WSDL: <message> has no name attribute"); } } else if (node_is_equal(trav,"portType")) { @@ -383,7 +383,7 @@ soap_error1(E_ERROR, "Parsing WSDL: <portType> '%s' already defined", name->children->content); } } else { - soap_error0(E_ERROR, "Parsing WSDL: <portType> hasn't name attribute"); + soap_error0(E_ERROR, "Parsing WSDL: <portType> has no name attribute"); } } else if (node_is_equal(trav,"binding")) { @@ -393,7 +393,7 @@ soap_error1(E_ERROR, "Parsing WSDL: <binding> '%s' already defined", name->children->content); } } else { - soap_error0(E_ERROR, "Parsing WSDL: <binding> hasn't name attribute"); + soap_error0(E_ERROR, "Parsing WSDL: <binding> has no name attribute"); } } else if (node_is_equal(trav,"service")) { @@ -403,7 +403,7 @@ soap_error1(E_ERROR, "Parsing WSDL: <service> '%s' already defined", name->children->content); } } else { - soap_error0(E_ERROR, "Parsing WSDL: <service> hasn't name attribute"); + soap_error0(E_ERROR, "Parsing WSDL: <service> has no name attribute"); } } else if (!node_is_equal(trav,"documentation")) { soap_error1(E_ERROR, "Parsing WSDL: Unexpected WSDL element <%s>", trav->name); Modified: php/php-src/trunk/ext/soap/php_encoding.c =================================================================== --- php/php-src/trunk/ext/soap/php_encoding.c 2010-09-03 19:40:04 UTC (rev 303033) +++ php/php-src/trunk/ext/soap/php_encoding.c 2010-09-03 22:24:08 UTC (rev 303034) @@ -372,7 +372,7 @@ HashTable *ht = Z_OBJPROP_P(data); if (zend_hash_find(ht, "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) { - soap_error0(E_ERROR, "Encoding: SoapVar hasn't 'enc_type' property"); + soap_error0(E_ERROR, "Encoding: SoapVar has no 'enc_type' property"); } if (zend_hash_find(ht, "enc_stype", sizeof("enc_stype"), (void **)&zstype) == SUCCESS) { @@ -1737,7 +1737,7 @@ return 2; } else { if (strict) { - soap_error1(E_ERROR, "Encoding: object hasn't '%s' property", model->u.element->name); + soap_error1(E_ERROR, "Encoding: object has no '%s' property", model->u.element->name); } return 0; } @@ -1770,7 +1770,7 @@ return 2; } else { if (strict) { - soap_error0(E_ERROR, "Encoding: object hasn't 'any' property"); + soap_error0(E_ERROR, "Encoding: object has no 'any' property"); } return 0; } @@ -3613,7 +3613,7 @@ zval **ztype; if (zend_hash_find(Z_OBJPROP_PP(tmp), "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) { - soap_error0(E_ERROR, "Encoding: SoapVar hasn't 'enc_type' property"); + soap_error0(E_ERROR, "Encoding: SoapVar has no 'enc_type' property"); } cur_type = Z_LVAL_PP(ztype); Modified: php/php-src/trunk/ext/soap/php_packet_soap.c =================================================================== --- php/php-src/trunk/ext/soap/php_packet_soap.c 2010-09-03 19:40:04 UTC (rev 303033) +++ php/php-src/trunk/ext/soap/php_packet_soap.c 2010-09-03 22:24:08 UTC (rev 303034) @@ -340,7 +340,7 @@ } } } else { - /* Function hasn't WSDL description */ + /* Function has no WSDL description */ xmlNodePtr val; val = resp->children; while (val != NULL) { Modified: php/php-src/trunk/ext/soap/php_sdl.c =================================================================== --- php/php-src/trunk/ext/soap/php_sdl.c 2010-09-03 19:40:04 UTC (rev 303033) +++ php/php-src/trunk/ext/soap/php_sdl.c 2010-09-03 22:24:08 UTC (rev 303034) @@ -373,7 +373,7 @@ soap_error1(E_ERROR, "Parsing WSDL: <message> '%s' already defined", name->children->content); } } else { - soap_error0(E_ERROR, "Parsing WSDL: <message> hasn't name attribute"); + soap_error0(E_ERROR, "Parsing WSDL: <message> has no name attribute"); } } else if (node_is_equal(trav,"portType")) { @@ -383,7 +383,7 @@ soap_error1(E_ERROR, "Parsing WSDL: <portType> '%s' already defined", name->children->content); } } else { - soap_error0(E_ERROR, "Parsing WSDL: <portType> hasn't name attribute"); + soap_error0(E_ERROR, "Parsing WSDL: <portType> has no name attribute"); } } else if (node_is_equal(trav,"binding")) { @@ -393,7 +393,7 @@ soap_error1(E_ERROR, "Parsing WSDL: <binding> '%s' already defined", name->children->content); } } else { - soap_error0(E_ERROR, "Parsing WSDL: <binding> hasn't name attribute"); + soap_error0(E_ERROR, "Parsing WSDL: <binding> has no name attribute"); } } else if (node_is_equal(trav,"service")) { @@ -403,7 +403,7 @@ soap_error1(E_ERROR, "Parsing WSDL: <service> '%s' already defined", name->children->content); } } else { - soap_error0(E_ERROR, "Parsing WSDL: <service> hasn't name attribute"); + soap_error0(E_ERROR, "Parsing WSDL: <service> has no name attribute"); } } else if (!node_is_equal(trav,"documentation")) { soap_error1(E_ERROR, "Parsing WSDL: Unexpected WSDL element <%s>", trav->name);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php