Skip to content

Commit 5d81d2d

Browse files
committed
Simplify code for handling mbstring language aliases
Rather than using pointers to pointers to pointers (3 levels of indirection), what makes sense is two levels. This reduces unnecessary pointer dereference operations.
1 parent 9cc171e commit 5d81d2d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ext/mbstring/libmbfl/mbfl/mbfl_language.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ mbfl_name2language(const char *name)
9999
}
100100
}
101101

102-
/* serch aliases */
102+
/* search aliases */
103103
i = 0;
104104
while ((language = mbfl_language_ptr_table[i++]) != NULL) {
105105
if (language->aliases != NULL) {
106106
j = 0;
107-
while ((*language->aliases)[j] != NULL) {
108-
if (strcasecmp((*language->aliases)[j], name) == 0) {
107+
while (language->aliases[j]) {
108+
if (strcasecmp(language->aliases[j], name) == 0) {
109109
return language;
110110
}
111111
j++;

ext/mbstring/libmbfl/mbfl/mbfl_language.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ typedef struct _mbfl_language {
7272
enum mbfl_no_language no_language;
7373
const char *name;
7474
const char *short_name;
75-
const char *(*aliases)[];
75+
const char **aliases;
7676
enum mbfl_no_encoding mail_charset;
7777
enum mbfl_no_encoding mail_header_encoding;
7878
enum mbfl_no_encoding mail_body_encoding;

ext/mbstring/libmbfl/nls/nls_de.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const mbfl_language mbfl_language_german = {
66
mbfl_no_language_german,
77
"German",
88
"de",
9-
(const char *(*)[])&mbfl_language_german_aliases,
9+
mbfl_language_german_aliases,
1010
mbfl_no_encoding_8859_15,
1111
mbfl_no_encoding_qprint,
1212
mbfl_no_encoding_8bit

ext/mbstring/libmbfl/nls/nls_uni.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const mbfl_language mbfl_language_uni = {
66
mbfl_no_language_uni,
77
"uni",
88
"uni",
9-
(const char *(*)[])&mbfl_language_uni_aliases,
9+
mbfl_language_uni_aliases,
1010
mbfl_no_encoding_utf8,
1111
mbfl_no_encoding_base64,
1212
mbfl_no_encoding_base64

0 commit comments

Comments
 (0)