From: Hannes Magnusson Date: Sat, 13 Oct 2007 11:34:43 +0000 (+0000) Subject: MFH: Fix typo and remove dots in error messages X-Git-Tag: RELEASE_1_3_1~849 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccce08e668b65ac8cd1c4eaf90bcf27b4d06efe8;p=php MFH: Fix typo and remove dots in error messages --- diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 7e84732033..a460200c01 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -174,7 +174,7 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); } \ \ if (!php_memnstr(str, tmp_url->path, strlen(tmp_url->path), str + len)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s' contains unencoded control characters.", str); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s' contains unencoded control characters", str); \ php_url_free(tmp_url); \ php_curl_ret(__ret); \ } \ @@ -980,7 +980,7 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen) strlcpy(buf, Z_STRVAL_P(retval), Z_STRLEN_P(retval)); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s' did not return a string.", Z_STRVAL_P(func)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s' did not return a string", Z_STRVAL_P(func)); } zval_ptr_dtor(&argv[0]); @@ -1645,7 +1645,7 @@ PHP_FUNCTION(curl_setopt_array) zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos); while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)&entry, &pos) == SUCCESS) { if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), &string_key, &str_key_len, &option, 0, &pos) == HASH_KEY_IS_STRING) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys must be CURLOPT constants or equivalent interger values."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys must be CURLOPT constants or equivalent integer values"); RETURN_FALSE; } if (_php_curl_setopt(ch, option, entry, return_value TSRMLS_CC)) {