Skip to content

Commit b22f47e

Browse files
felipenspfelipensp
committed
- Added arginfo
1 parent 91fba38 commit b22f47e

File tree

7 files changed

+500
-105
lines changed

7 files changed

+500
-105
lines changed

‎ext/mime_magic/mime_magic.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,16 @@ static PHP_GINIT_FUNCTION(mime_magic);
217217
/* True global resources - no need for thread safety here */
218218
static magic_server_config_rec mime_global;
219219

220+
/* {{{ arginfo */
221+
static
222+
ZEND_BEGIN_ARG_INFO_EX(arginfo_mime_content_type, 0, 0, 1)
223+
ZEND_ARG_INFO(0, filename)
224+
ZEND_END_ARG_INFO()
225+
/* }}} */
226+
220227
/* {{{ mime_magic_functions[] */
221228
const zend_function_entry mime_magic_functions[] = {
222-
PHP_FE(mime_content_type, NULL)
229+
PHP_FE(mime_content_type, arginfo_mime_content_type)
223230
{NULL, NULL, NULL}
224231
};
225232
/* }}} */

‎ext/msql/php_msql.c

Lines changed: 211 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -44,58 +44,224 @@ static php_msql_globals msql_globals;
4444
#define MSQL_NUM 1<<1
4545
#define MSQL_BOTH (MSQL_ASSOC|MSQL_NUM)
4646

47+
/* {{{ arginfo */
48+
static
49+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_connect, 0, 0, 0)
50+
ZEND_ARG_INFO(0, hostname)
51+
ZEND_ARG_INFO(0, username)
52+
ZEND_ARG_INFO(0, password)
53+
ZEND_END_ARG_INFO()
54+
55+
static
56+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_pconnect, 0, 0, 0)
57+
ZEND_ARG_INFO(0, hostname)
58+
ZEND_ARG_INFO(0, username)
59+
ZEND_ARG_INFO(0, password)
60+
ZEND_END_ARG_INFO()
61+
62+
static
63+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_close, 0, 0, 0)
64+
ZEND_ARG_INFO(0, link_identifier)
65+
ZEND_END_ARG_INFO()
66+
67+
static
68+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_select_db, 0, 0, 1)
69+
ZEND_ARG_INFO(0, database_name)
70+
ZEND_ARG_INFO(0, link_identifier)
71+
ZEND_END_ARG_INFO()
72+
73+
static
74+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_create_db, 0, 0, 1)
75+
ZEND_ARG_INFO(0, database_name)
76+
ZEND_ARG_INFO(0, link_identifier)
77+
ZEND_END_ARG_INFO()
78+
79+
static
80+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_drop_db, 0, 0, 1)
81+
ZEND_ARG_INFO(0, database_name)
82+
ZEND_ARG_INFO(0, link_identifier)
83+
ZEND_END_ARG_INFO()
84+
85+
static
86+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_query, 0, 0, 1)
87+
ZEND_ARG_INFO(0, query)
88+
ZEND_ARG_INFO(0, link_identifier)
89+
ZEND_END_ARG_INFO()
90+
91+
static
92+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_db_query, 0, 0, 2)
93+
ZEND_ARG_INFO(0, database_name)
94+
ZEND_ARG_INFO(0, query)
95+
ZEND_ARG_INFO(0, link_identifier)
96+
ZEND_END_ARG_INFO()
97+
98+
static
99+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_dbs, 0, 0, 0)
100+
ZEND_ARG_INFO(0, link_identifier)
101+
ZEND_END_ARG_INFO()
102+
103+
static
104+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_tables, 0, 0, 1)
105+
ZEND_ARG_INFO(0, database_name)
106+
ZEND_ARG_INFO(0, link_identifier)
107+
ZEND_END_ARG_INFO()
108+
109+
static
110+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_fields, 0, 0, 2)
111+
ZEND_ARG_INFO(0, database_name)
112+
ZEND_ARG_INFO(0, table_name)
113+
ZEND_ARG_INFO(0, link_identifier)
114+
ZEND_END_ARG_INFO()
115+
116+
static
117+
ZEND_BEGIN_ARG_INFO(arginfo_msql_error, 0)
118+
ZEND_END_ARG_INFO()
119+
120+
static
121+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_result, 0, 0, 2)
122+
ZEND_ARG_INFO(0, query)
123+
ZEND_ARG_INFO(0, row)
124+
ZEND_ARG_INFO(0, field)
125+
ZEND_END_ARG_INFO()
126+
127+
static
128+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_rows, 0, 0, 1)
129+
ZEND_ARG_INFO(0, query)
130+
ZEND_END_ARG_INFO()
131+
132+
static
133+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_fields, 0, 0, 1)
134+
ZEND_ARG_INFO(0, query)
135+
ZEND_END_ARG_INFO()
136+
137+
static
138+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_row, 0, 0, 1)
139+
ZEND_ARG_INFO(0, query)
140+
ZEND_END_ARG_INFO()
141+
142+
static
143+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_object, 0, 0, 1)
144+
ZEND_ARG_INFO(0, query)
145+
ZEND_ARG_INFO(0, result_type)
146+
ZEND_END_ARG_INFO()
147+
148+
static
149+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_array, 0, 0, 1)
150+
ZEND_ARG_INFO(0, query)
151+
ZEND_ARG_INFO(0, result_type)
152+
ZEND_END_ARG_INFO()
153+
154+
static
155+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_data_seek, 0, 0, 2)
156+
ZEND_ARG_INFO(0, query)
157+
ZEND_ARG_INFO(0, row_number)
158+
ZEND_END_ARG_INFO()
159+
160+
static
161+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_field, 0, 0, 1)
162+
ZEND_ARG_INFO(0, query)
163+
ZEND_ARG_INFO(0, field_offset)
164+
ZEND_END_ARG_INFO()
165+
166+
static
167+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_seek, 0, 0, 2)
168+
ZEND_ARG_INFO(0, query)
169+
ZEND_ARG_INFO(0, field_offset)
170+
ZEND_END_ARG_INFO()
171+
172+
static
173+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_name, 0, 0, 2)
174+
ZEND_ARG_INFO(0, query)
175+
ZEND_ARG_INFO(0, field_index)
176+
ZEND_END_ARG_INFO()
177+
178+
static
179+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_table, 0, 0, 2)
180+
ZEND_ARG_INFO(0, query)
181+
ZEND_ARG_INFO(0, field_offset)
182+
ZEND_END_ARG_INFO()
183+
184+
static
185+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_len, 0, 0, 2)
186+
ZEND_ARG_INFO(0, query)
187+
ZEND_ARG_INFO(0, field_offet)
188+
ZEND_END_ARG_INFO()
189+
190+
static
191+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_type, 0, 0, 2)
192+
ZEND_ARG_INFO(0, query)
193+
ZEND_ARG_INFO(0, field_offset)
194+
ZEND_END_ARG_INFO()
195+
196+
static
197+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_flags, 0, 0, 2)
198+
ZEND_ARG_INFO(0, query)
199+
ZEND_ARG_INFO(0, field_offset)
200+
ZEND_END_ARG_INFO()
201+
202+
static
203+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_free_result, 0, 0, 1)
204+
ZEND_ARG_INFO(0, query)
205+
ZEND_END_ARG_INFO()
206+
207+
static
208+
ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_affected_rows, 0, 0, 1)
209+
ZEND_ARG_INFO(0, query)
210+
ZEND_END_ARG_INFO()
211+
/* }}} */
212+
47213
/* {{{ msql_functions[]
48214
*/
49215
const zend_function_entry msql_functions[] = {
50-
PHP_FE(msql_connect, NULL)
51-
PHP_FE(msql_pconnect, NULL)
52-
PHP_FE(msql_close, NULL)
53-
PHP_FE(msql_select_db, NULL)
54-
PHP_FE(msql_create_db, NULL)
55-
PHP_FE(msql_drop_db, NULL)
56-
PHP_FE(msql_query, NULL)
57-
PHP_FE(msql_db_query, NULL)
58-
PHP_FE(msql_list_dbs, NULL)
59-
PHP_FE(msql_list_tables, NULL)
60-
PHP_FE(msql_list_fields, NULL)
61-
PHP_FE(msql_error, NULL)
62-
PHP_FE(msql_result, NULL)
63-
PHP_FE(msql_num_rows, NULL)
64-
PHP_FE(msql_num_fields, NULL)
65-
PHP_FE(msql_fetch_row, NULL)
66-
PHP_FE(msql_fetch_array, NULL)
67-
PHP_FE(msql_fetch_object, NULL)
68-
PHP_FE(msql_data_seek, NULL)
69-
PHP_FE(msql_fetch_field, NULL)
70-
PHP_FE(msql_field_seek, NULL)
71-
PHP_FE(msql_free_result, NULL)
72-
PHP_FE(msql_field_name, NULL)
73-
PHP_FE(msql_field_table, NULL)
74-
PHP_FE(msql_field_len, NULL)
75-
PHP_FE(msql_field_type, NULL)
76-
PHP_FE(msql_field_flags, NULL)
216+
PHP_FE(msql_connect, arginfo_msql_connect)
217+
PHP_FE(msql_pconnect, arginfo_msql_pconnect)
218+
PHP_FE(msql_close, arginfo_msql_close)
219+
PHP_FE(msql_select_db, arginfo_msql_select_db)
220+
PHP_FE(msql_create_db, arginfo_msql_create_db)
221+
PHP_FE(msql_drop_db, arginfo_msql_drop_db)
222+
PHP_FE(msql_query, arginfo_msql_query)
223+
PHP_FE(msql_db_query, arginfo_msql_db_query)
224+
PHP_FE(msql_list_dbs, arginfo_msql_list_dbs)
225+
PHP_FE(msql_list_tables, arginfo_msql_list_tables)
226+
PHP_FE(msql_list_fields, arginfo_msql_list_fields)
227+
PHP_FE(msql_error, arginfo_msql_error)
228+
PHP_FE(msql_result, arginfo_msql_result)
229+
PHP_FE(msql_num_rows, arginfo_msql_num_rows)
230+
PHP_FE(msql_num_fields, arginfo_msql_num_fields)
231+
PHP_FE(msql_fetch_row, arginfo_msql_fetch_row)
232+
PHP_FE(msql_fetch_array, arginfo_msql_fetch_array)
233+
PHP_FE(msql_fetch_object, arginfo_msql_fetch_object)
234+
PHP_FE(msql_data_seek, arginfo_msql_data_seek)
235+
PHP_FE(msql_fetch_field, arginfo_msql_fetch_field)
236+
PHP_FE(msql_field_seek, arginfo_msql_field_seek)
237+
PHP_FE(msql_free_result, arginfo_msql_free_result)
238+
PHP_FE(msql_field_name, arginfo_msql_field_name)
239+
PHP_FE(msql_field_table, arginfo_msql_field_table)
240+
PHP_FE(msql_field_len, arginfo_msql_field_len)
241+
PHP_FE(msql_field_type, arginfo_msql_field_type)
242+
PHP_FE(msql_field_flags, arginfo_msql_field_flags)
77243

78-
PHP_FALIAS(msql_fieldname, msql_field_name, NULL)
79-
PHP_FALIAS(msql_fieldtable, msql_field_table, NULL)
80-
PHP_FALIAS(msql_fieldlen, msql_field_len, NULL)
81-
PHP_FALIAS(msql_fieldtype, msql_field_type, NULL)
82-
PHP_FALIAS(msql_fieldflags, msql_field_flags, NULL)
244+
PHP_FALIAS(msql_fieldname, msql_field_name, arginfo_msql_field_name)
245+
PHP_FALIAS(msql_fieldtable, msql_field_table, arginfo_msql_field_table)
246+
PHP_FALIAS(msql_fieldlen, msql_field_len, arginfo_msql_field_len)
247+
PHP_FALIAS(msql_fieldtype, msql_field_type, arginfo_msql_field_type)
248+
PHP_FALIAS(msql_fieldflags, msql_field_flags, arginfo_msql_field_flags)
83249

84-
PHP_FALIAS(msql_affected_rows, msql_affected_rows, NULL)
250+
PHP_FALIAS(msql_affected_rows, msql_affected_rows, arginfo_msql_affected_rows)
85251

86252
/* for downwards compatability */
87-
PHP_FALIAS(msql, msql_db_query, NULL)
88-
PHP_FALIAS(msql_selectdb, msql_select_db, NULL)
89-
PHP_FALIAS(msql_createdb, msql_create_db, NULL)
90-
PHP_FALIAS(msql_dropdb, msql_drop_db, NULL)
91-
PHP_FALIAS(msql_freeresult, msql_free_result, NULL)
92-
PHP_FALIAS(msql_numfields, msql_num_fields, NULL)
93-
PHP_FALIAS(msql_numrows, msql_num_rows, NULL)
94-
PHP_FALIAS(msql_listdbs, msql_list_dbs, NULL)
95-
PHP_FALIAS(msql_listtables, msql_list_tables, NULL)
96-
PHP_FALIAS(msql_listfields, msql_list_fields, NULL)
97-
PHP_FALIAS(msql_dbname, msql_result, NULL)
98-
PHP_FALIAS(msql_tablename, msql_result, NULL)
253+
PHP_FALIAS(msql, msql_db_query, arginfo_msql_db_query)
254+
PHP_FALIAS(msql_selectdb, msql_select_db, arginfo_msql_select_db)
255+
PHP_FALIAS(msql_createdb, msql_create_db, arginfo_msql_create_db)
256+
PHP_FALIAS(msql_dropdb, msql_drop_db, arginfo_msql_drop_db)
257+
PHP_FALIAS(msql_freeresult, msql_free_result, arginfo_msql_free_result)
258+
PHP_FALIAS(msql_numfields, msql_num_fields, arginfo_msql_num_fields)
259+
PHP_FALIAS(msql_numrows, msql_num_rows, arginfo_msql_num_rows)
260+
PHP_FALIAS(msql_listdbs, msql_list_dbs, arginfo_msql_list_dbs)
261+
PHP_FALIAS(msql_listtables, msql_list_tables, arginfo_msql_list_tables)
262+
PHP_FALIAS(msql_listfields, msql_list_fields, arginfo_msql_list_fields)
263+
PHP_FALIAS(msql_dbname, msql_result, arginfo_msql_result)
264+
PHP_FALIAS(msql_tablename, msql_result, arginfo_msql_result)
99265
{NULL, NULL, NULL}
100266
};
101267
/* }}} */

0 commit comments

Comments
 (0)