diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-06-30 17:00:25 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-06-30 17:00:25 -0700 |
| commit | a3322f8927618a8cadbef4ae2121084b44a564d3 (patch) | |
| tree | 939a94efa58136e851e478e070daf89edaa18376 /ext/intl/normalizer/normalizer_normalize.c | |
| parent | eb012cf88440423ff02c46421f29a1c6e850702c (diff) | |
| parent | 896ac689c91967dec0601fa9fe048c518da52a3c (diff) | |
| download | php-git-a3322f8927618a8cadbef4ae2121084b44a564d3.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
Diffstat (limited to 'ext/intl/normalizer/normalizer_normalize.c')
| -rwxr-xr-x | ext/intl/normalizer/normalizer_normalize.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c index 466ab97e12..f46285e9d9 100755 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize.c @@ -110,7 +110,7 @@ PHP_FUNCTION( normalizer_normalize ) /* normalize */ size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status); - /* Bail out if an unexpected error occured. + /* Bail out if an unexpected error occurred. * (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough). * (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty). */ @@ -133,7 +133,7 @@ PHP_FUNCTION( normalizer_normalize ) /* try normalize again */ size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status); - /* Bail out if an unexpected error occured. */ + /* Bail out if an unexpected error occurred. */ if( U_FAILURE(status) ) { /* Set error messages. */ intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC ); @@ -234,7 +234,7 @@ PHP_FUNCTION( normalizer_is_normalized ) efree( uinput ); - /* Bail out if an unexpected error occured. */ + /* Bail out if an unexpected error occurred. */ if( U_FAILURE(status) ) { /* Set error messages. */ intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC ); |