Skip to content

Commit b94ef47

Browse files
devnexendevnexen
committed
ext/gettext: update arguments handling.
using zend_string whenever relevant too.
1 parent 3f05418 commit b94ef47

File tree

1 file changed

+72
-59
lines changed

1 file changed

+72
-59
lines changed

‎ext/gettext/gettext.c

Lines changed: 72 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ PHP_MINFO_FUNCTION(php_gettext)
7878
/* {{{ Set the textdomain to "domain". Returns the current domain */
7979
PHP_FUNCTION(textdomain)
8080
{
81-
char *domain_name = NULL, *retval;
81+
char *retval = NULL, *domain_name = NULL;
8282
zend_string *domain = NULL;
8383

84-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S!", &domain) == FAILURE) {
85-
RETURN_THROWS();
86-
}
84+
ZEND_PARSE_PARAMETERS_START(0, 1)
85+
Z_PARAM_OPTIONAL
86+
Z_PARAM_STR_OR_NULL(domain)
87+
ZEND_PARSE_PARAMETERS_END();
8788

8889
if (domain != NULL && ZSTR_LEN(domain) != 0 && !zend_string_equals_literal(domain, "0")) {
8990
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
@@ -99,7 +100,7 @@ PHP_FUNCTION(textdomain)
99100
/* {{{ Return the translation of msgid for the current domain, or msgid unaltered if a translation does not exist */
100101
PHP_FUNCTION(gettext)
101102
{
102-
char *msgstr;
103+
char *msgstr = NULL;
103104
zend_string *msgid;
104105

105106
ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -120,12 +121,13 @@ PHP_FUNCTION(gettext)
120121
/* {{{ Return the translation of msgid for domain_name, or msgid unaltered if a translation does not exist */
121122
PHP_FUNCTION(dgettext)
122123
{
123-
char *msgstr;
124+
char *msgstr = NULL;
124125
zend_string *domain, *msgid;
125126

126-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &domain, &msgid) == FAILURE) {
127-
RETURN_THROWS();
128-
}
127+
ZEND_PARSE_PARAMETERS_START(2, 2)
128+
Z_PARAM_STR(domain)
129+
Z_PARAM_STR(msgid)
130+
ZEND_PARSE_PARAMETERS_END();
129131

130132
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
131133
PHP_GETTEXT_LENGTH_CHECK(2, ZSTR_LEN(msgid))
@@ -143,13 +145,15 @@ PHP_FUNCTION(dgettext)
143145
/* {{{ Return the translation of msgid for domain_name and category, or msgid unaltered if a translation does not exist */
144146
PHP_FUNCTION(dcgettext)
145147
{
146-
char *msgstr;
148+
char *msgstr = NULL;
147149
zend_string *domain, *msgid;
148150
zend_long category;
149151

150-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSl", &domain, &msgid, &category) == FAILURE) {
151-
RETURN_THROWS();
152-
}
152+
ZEND_PARSE_PARAMETERS_START(3, 3)
153+
Z_PARAM_STR(domain)
154+
Z_PARAM_STR(msgid)
155+
Z_PARAM_LONG(category)
156+
ZEND_PARSE_PARAMETERS_END();
153157

154158
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
155159
PHP_GETTEXT_LENGTH_CHECK(2, ZSTR_LEN(msgid))
@@ -168,24 +172,24 @@ PHP_FUNCTION(dcgettext)
168172
/* {{{ Bind to the text domain domain_name, looking for translations in dir. Returns the current domain */
169173
PHP_FUNCTION(bindtextdomain)
170174
{
171-
char *domain;
172-
size_t domain_len;
173-
zend_string *dir = NULL;
175+
zend_string *domain, *dir = NULL;
174176
char *retval, dir_name[MAXPATHLEN];
175177

176-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sS!", &domain, &domain_len, &dir) == FAILURE) {
177-
RETURN_THROWS();
178-
}
178+
ZEND_PARSE_PARAMETERS_START(1, 2)
179+
Z_PARAM_STR(domain)
180+
Z_PARAM_OPTIONAL
181+
Z_PARAM_STR_OR_NULL(dir)
182+
ZEND_PARSE_PARAMETERS_END();
179183

180-
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, domain_len)
184+
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
181185

182-
if (!domain_len) {
186+
if (!ZSTR_LEN(domain)) {
183187
zend_argument_value_error(1, "cannot be empty");
184188
RETURN_THROWS();
185189
}
186190

187191
if (dir == NULL) {
188-
RETURN_STRING(bindtextdomain(domain, NULL));
192+
RETURN_STRING(bindtextdomain(ZSTR_VAL(domain), NULL));
189193
}
190194

191195
if (ZSTR_LEN(dir) != 0 && !zend_string_equals_literal(dir, "0")) {
@@ -196,7 +200,7 @@ PHP_FUNCTION(bindtextdomain)
196200
RETURN_FALSE;
197201
}
198202

199-
retval = bindtextdomain(domain, dir_name);
203+
retval = bindtextdomain(ZSTR_VAL(domain), dir_name);
200204

201205
RETURN_STRING(retval);
202206
}
@@ -206,18 +210,20 @@ PHP_FUNCTION(bindtextdomain)
206210
/* {{{ Plural version of gettext() */
207211
PHP_FUNCTION(ngettext)
208212
{
209-
char *msgid1, *msgid2, *msgstr;
210-
size_t msgid1_len, msgid2_len;
213+
char *msgstr = NULL;
214+
zend_string *msgid1, *msgid2;
211215
zend_long count;
212216

213-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssl", &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) {
214-
RETURN_THROWS();
215-
}
217+
ZEND_PARSE_PARAMETERS_START(3, 3)
218+
Z_PARAM_STR(msgid1)
219+
Z_PARAM_STR(msgid2)
220+
Z_PARAM_LONG(count)
221+
ZEND_PARSE_PARAMETERS_END();
216222

217-
PHP_GETTEXT_LENGTH_CHECK(1, msgid1_len)
218-
PHP_GETTEXT_LENGTH_CHECK(2, msgid2_len)
223+
PHP_GETTEXT_LENGTH_CHECK(1, ZSTR_LEN(msgid1))
224+
PHP_GETTEXT_LENGTH_CHECK(2, ZSTR_LEN(msgid2))
219225

220-
msgstr = ngettext(msgid1, msgid2, count);
226+
msgstr = ngettext(ZSTR_VAL(msgid1), ZSTR_VAL(msgid2), count);
221227

222228
ZEND_ASSERT(msgstr);
223229
RETURN_STRING(msgstr);
@@ -229,20 +235,22 @@ PHP_FUNCTION(ngettext)
229235
/* {{{ Plural version of dgettext() */
230236
PHP_FUNCTION(dngettext)
231237
{
232-
char *domain, *msgid1, *msgid2, *msgstr = NULL;
233-
size_t domain_len, msgid1_len, msgid2_len;
238+
char *msgstr = NULL;
239+
zend_string *domain, *msgid1, *msgid2;
234240
zend_long count;
235241

236-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sssl", &domain, &domain_len,
237-
&msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) {
238-
RETURN_THROWS();
239-
}
242+
ZEND_PARSE_PARAMETERS_START(4, 4)
243+
Z_PARAM_STR(domain)
244+
Z_PARAM_STR(msgid1)
245+
Z_PARAM_STR(msgid2)
246+
Z_PARAM_LONG(count)
247+
ZEND_PARSE_PARAMETERS_END();
240248

241-
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, domain_len)
242-
PHP_GETTEXT_LENGTH_CHECK(2, msgid1_len)
243-
PHP_GETTEXT_LENGTH_CHECK(3, msgid2_len)
249+
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
250+
PHP_GETTEXT_LENGTH_CHECK(2, ZSTR_LEN(msgid1))
251+
PHP_GETTEXT_LENGTH_CHECK(3, ZSTR_LEN(msgid2))
244252

245-
msgstr = dngettext(domain, msgid1, msgid2, count);
253+
msgstr = dngettext(ZSTR_VAL(domain), ZSTR_VAL(msgid1), ZSTR_VAL(msgid2), count);
246254

247255
ZEND_ASSERT(msgstr);
248256
RETURN_STRING(msgstr);
@@ -254,23 +262,26 @@ PHP_FUNCTION(dngettext)
254262
/* {{{ Plural version of dcgettext() */
255263
PHP_FUNCTION(dcngettext)
256264
{
257-
char *domain, *msgid1, *msgid2, *msgstr = NULL;
258-
size_t domain_len, msgid1_len, msgid2_len;
265+
char *msgstr = NULL;
266+
zend_string *domain, *msgid1, *msgid2;
259267
zend_long count, category;
260268

261269
RETVAL_FALSE;
262270

263-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sssll", &domain, &domain_len,
264-
&msgid1, &msgid1_len, &msgid2, &msgid2_len, &count, &category) == FAILURE) {
265-
RETURN_THROWS();
266-
}
271+
ZEND_PARSE_PARAMETERS_START(5, 5)
272+
Z_PARAM_STR(domain)
273+
Z_PARAM_STR(msgid1)
274+
Z_PARAM_STR(msgid2)
275+
Z_PARAM_LONG(count)
276+
Z_PARAM_LONG(category)
277+
ZEND_PARSE_PARAMETERS_END();
267278

268-
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, domain_len)
269-
PHP_GETTEXT_LENGTH_CHECK(2, msgid1_len)
270-
PHP_GETTEXT_LENGTH_CHECK(3, msgid2_len)
279+
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
280+
PHP_GETTEXT_LENGTH_CHECK(2, ZSTR_LEN(msgid1))
281+
PHP_GETTEXT_LENGTH_CHECK(3, ZSTR_LEN(msgid2))
271282
PHP_DCGETTEXT_CATEGORY_CHECK(5, category)
272283

273-
msgstr = dcngettext(domain, msgid1, msgid2, count, category);
284+
msgstr = dcngettext(ZSTR_VAL(domain), ZSTR_VAL(msgid1), ZSTR_VAL(msgid2), count, category);
274285

275286
ZEND_ASSERT(msgstr);
276287
RETURN_STRING(msgstr);
@@ -283,21 +294,23 @@ PHP_FUNCTION(dcngettext)
283294
/* {{{ Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. */
284295
PHP_FUNCTION(bind_textdomain_codeset)
285296
{
286-
char *domain, *codeset = NULL, *retval = NULL;
287-
size_t domain_len, codeset_len;
297+
char *retval = NULL;
298+
zend_string *domain, *codeset = NULL;
288299

289-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss!", &domain, &domain_len, &codeset, &codeset_len) == FAILURE) {
290-
RETURN_THROWS();
291-
}
300+
ZEND_PARSE_PARAMETERS_START(1, 2)
301+
Z_PARAM_STR(domain)
302+
Z_PARAM_OPTIONAL
303+
Z_PARAM_STR_OR_NULL(codeset)
304+
ZEND_PARSE_PARAMETERS_END();
292305

293-
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, domain_len)
306+
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
294307

295-
if (!domain_len) {
308+
if (!ZSTR_LEN(domain)) {
296309
zend_argument_value_error(1, "cannot be empty");
297310
RETURN_THROWS();
298311
}
299312

300-
retval = bind_textdomain_codeset(domain, codeset);
313+
retval = bind_textdomain_codeset(ZSTR_VAL(domain), codeset ? ZSTR_VAL(codeset) : NULL);
301314

302315
if (!retval) {
303316
RETURN_FALSE;

0 commit comments

Comments
 (0)