clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved fribidi_charset_info() slightly

Browse Source
This commit is contained in:
Tal Peer 2002-10-17 18:32:16 +00:00
parent b941224d5d
commit 56f744e0df
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ext/fribidi/fribidi.c
View File

@ -260,8 +260,6 @@ PHP_FUNCTION(fribidi_charset_info)
return;
}
array_init(return_value);
switch (charset) {
case FRIBIDI_CHARSET_UTF8:
case FRIBIDI_CHARSET_ISO8859_6:
@ -270,26 +268,25 @@ PHP_FUNCTION(fribidi_charset_info)
case FRIBIDI_CHARSET_CP1256:
case FRIBIDI_CHARSET_ISIRI_3342:
case FRIBIDI_CHARSET_CAP_RTL:
array_init(return_value);
name = fribidi_char_set_name(charset);
title = fribidi_char_set_title(charset);
desc = fribidi_char_set_desc(charset);
if (name == NULL) {
name = "";
if (name) {
add_assoc_string_ex(return_value, "name", sizeof("name"), name, 1);
}
if (title == NULL) {
title = "";
if (title) {
add_assoc_string_ex(return_value, "title", sizeof("title"), title, 1);
}
if (desc == NULL) {
desc = "";
if (desc) {
add_assoc_string_ex(return_value, "desc", sizeof("desc"), desc, 1);
}
add_assoc_string(return_value, "name", name , 1);
add_assoc_string(return_value, "title", title, 1);
add_assoc_string(return_value, "desc", desc, 1);
break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown charset");
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown charset.");
RETURN_FALSE;
}
}