diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/intl/intl_error.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/intl/intl_error.c')
| -rw-r--r-- | ext/intl/intl_error.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/intl_error.c b/ext/intl/intl_error.c index 401e5b187b..28a2a244e2 100644 --- a/ext/intl/intl_error.c +++ b/ext/intl/intl_error.c @@ -268,7 +268,7 @@ smart_str intl_parse_error_to_string( UParseError* pe ) smart_str_appends( &ret, "at " ); smart_str_appends( &ret, "offset " ); - smart_str_append_long( &ret, (zend_long ) pe->offset ); + smart_str_append_long( &ret, (zend_long ) pe->offset ); any = 1; } @@ -315,7 +315,7 @@ smart_str intl_parse_error_to_string( UParseError* pe ) smart_str_free( &ret ); smart_str_appends( &ret, "no parse error" ); } - + smart_str_0( &ret ); return ret; } |