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

We no longer need any FETCH's for internal functions

Browse Source
This commit is contained in:
Zeev Suraski 2001-08-02 05:49:24 +00:00
parent 8cf4e4a725
commit 5dfe1deb96
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.EXT_SKEL
View File

@ -154,15 +154,14 @@ PHP_FUNCTION(my_drawtext)
int argc;
int image_id = -1;
int font_id = -1;
TSRMLS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc < 5 || argc > 6 || zend_get_parameters_ex(argc, &image, &text, &font, &x, &y, &color) == FAILURE) {
WRONG_PARAM_COUNT;
}
ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???G());
ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???G());
ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???_rsrc_id);
ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???_rsrc_id);
switch (argc) {
case 6:

5
ext/skeleton/create_stubs
View File

@ -48,9 +48,9 @@ function convert(i, j, t)
if (opt && i > -1) {
resources = resources "\tif (argc < " j+1 ") {\n" \
comment("\t\t/* Argument not given, do something before\n\t\t trying to fetch resource " name ". */\n") \
"\t}\n\tZEND_FETCH_RESOURCE(???, ???, " name ext ", " name "_id, \"???\", ???G());\n"
"\t}\n\tZEND_FETCH_RESOURCE(???, ???, " name ext ", " name "_id, \"???\", ???_rsrc_id);\n"
} else {
resources = resources "\tZEND_FETCH_RESOURCE(???, ???, " name ext ", " name "_id, \"???\", ???G());\n"
resources = resources "\tZEND_FETCH_RESOURCE(???, ???, " name ext ", " name "_id, \"???\", ???_rsrc_id);\n"
}
funcvals = funcvals "\tint " name "_id = -1;\n"
} else {
@ -272,7 +272,6 @@ END {
fetchargs = fetchargs ") == FAILURE)" closefetch "{\n\t\tZEND_WRONG_PARAM_COUNT();\n\t}\n"
}
if (assign_params) funcvals = ints doubles floats strings
if (resources) funcvals = funcvals "\tTSRMLS_FETCH();\n"
if (useswitch[i]) {
if (check_argc_in_switch[i]) {
check_argc = "\t\tdefault:\n\t\t\tZEND_WRONG_PARAM_COUNT();\n"