Skip to content

Commit 6e7f7ba

Browse files
kamil-tekielakamil-tekiela
committed
Remove unused __name parameter
1 parent 9d1431c commit 6e7f7ba

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎ext/mysqli/mysqli.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
784784
}
785785
}
786786
}
787-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
787+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
788788

789789
if (fetchtype < MYSQLI_ASSOC || fetchtype > MYSQLI_BOTH) {
790790
zend_argument_value_error(ERROR_ARG_POS(2), "must be one of MYSQLI_NUM, MYSQLI_ASSOC, or MYSQLI_BOTH");

‎ext/mysqli/mysqli_api.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ PHP_FUNCTION(mysqli_data_seek)
324324
RETURN_THROWS();
325325
}
326326

327-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
327+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
328328

329329
if (mysqli_result_is_unbuffered(result)) {
330330
if (hasThis()) {
@@ -670,7 +670,7 @@ PHP_FUNCTION(mysqli_fetch_field)
670670
RETURN_THROWS();
671671
}
672672

673-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
673+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
674674

675675
if (!(field = mysql_fetch_field(result))) {
676676
RETURN_FALSE;
@@ -694,7 +694,7 @@ PHP_FUNCTION(mysqli_fetch_fields)
694694
RETURN_THROWS();
695695
}
696696

697-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
697+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
698698

699699
array_init(return_value);
700700
num_fields = mysql_num_fields(result);
@@ -727,7 +727,7 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
727727
RETURN_THROWS();
728728
}
729729

730-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
730+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
731731

732732
if (offset >= (zend_long) mysql_num_fields(result)) {
733733
zend_argument_value_error(ERROR_ARG_POS(2), "must be less than the number of fields for this result set");
@@ -755,7 +755,7 @@ PHP_FUNCTION(mysqli_fetch_lengths)
755755
RETURN_THROWS();
756756
}
757757

758-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
758+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
759759

760760
// TODO Warning?
761761
if (!(ret = mysql_fetch_lengths(result))) {
@@ -809,7 +809,7 @@ PHP_FUNCTION(mysqli_field_seek)
809809
RETURN_THROWS();
810810
}
811811

812-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
812+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
813813

814814
if ((uint32_t)fieldnr >= mysql_num_fields(result)) {
815815
zend_argument_value_error(ERROR_ARG_POS(2), "must be less than the number of fields for this result set");
@@ -830,7 +830,7 @@ PHP_FUNCTION(mysqli_field_tell)
830830
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
831831
RETURN_THROWS();
832832
}
833-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
833+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
834834

835835
RETURN_LONG(mysql_field_tell(result));
836836
}
@@ -845,7 +845,7 @@ PHP_FUNCTION(mysqli_free_result)
845845
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
846846
RETURN_THROWS();
847847
}
848-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
848+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
849849

850850
mysqli_free_result(result, false);
851851
MYSQLI_CLEAR_RESOURCE(mysql_result);
@@ -1123,7 +1123,7 @@ PHP_FUNCTION(mysqli_num_fields)
11231123
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
11241124
RETURN_THROWS();
11251125
}
1126-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
1126+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
11271127

11281128
RETURN_LONG(mysql_num_fields(result));
11291129
}
@@ -1138,7 +1138,7 @@ PHP_FUNCTION(mysqli_num_rows)
11381138
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
11391139
RETURN_THROWS();
11401140
}
1141-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
1141+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
11421142

11431143
if (mysqli_result_is_unbuffered_and_not_everything_is_fetched(result)) {
11441144
zend_throw_error(NULL, "mysqli_num_rows() cannot be used in MYSQLI_USE_RESULT mode");

‎ext/mysqli/mysqli_nonapi.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ PHP_FUNCTION(mysqli_fetch_column)
391391
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &col_no) == FAILURE) {
392392
RETURN_THROWS();
393393
}
394-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES*, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
394+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES*, mysql_result, MYSQLI_STATUS_VALID);
395395

396396
if (col_no < 0) {
397397
zend_argument_value_error(ERROR_ARG_POS(2), "must be greater than or equal to 0");
@@ -423,7 +423,7 @@ PHP_FUNCTION(mysqli_fetch_all)
423423
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &mode) == FAILURE) {
424424
RETURN_THROWS();
425425
}
426-
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
426+
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, MYSQLI_STATUS_VALID);
427427

428428
if (!mode || (mode & ~MYSQLI_BOTH)) {
429429
zend_argument_value_error(ERROR_ARG_POS(2), "must be one of MYSQLI_NUM, MYSQLI_ASSOC, or MYSQLI_BOTH");

‎ext/mysqli/mysqli_result_iterator.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static void php_mysqli_result_iterator_move_forward(zend_object_iterator *iter)
9898
mysqli_object *intern = iterator->result;
9999
MYSQL_RES *result;
100100

101-
MYSQLI_FETCH_RESOURCE_BY_OBJ(result, MYSQL_RES *, intern, "mysqli_result", MYSQLI_STATUS_VALID);
101+
MYSQLI_FETCH_RESOURCE_BY_OBJ(result, MYSQL_RES *, intern, MYSQLI_STATUS_VALID);
102102

103103
zval_ptr_dtor(&iterator->current_row);
104104
php_mysqli_fetch_into_hash_aux(&iterator->current_row, result, MYSQLI_ASSOC);
@@ -115,7 +115,7 @@ static void php_mysqli_result_iterator_rewind(zend_object_iterator *iter)
115115
mysqli_object *intern = iterator->result;
116116
MYSQL_RES *result;
117117

118-
MYSQLI_FETCH_RESOURCE_BY_OBJ(result, MYSQL_RES *, intern, "mysqli_result", MYSQLI_STATUS_VALID);
118+
MYSQLI_FETCH_RESOURCE_BY_OBJ(result, MYSQL_RES *, intern, MYSQLI_STATUS_VALID);
119119

120120
if (mysqli_result_is_unbuffered(result)) {
121121
if (result->unbuf->eof_reached) {

‎ext/mysqli/mysqli_warning.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ PHP_METHOD(mysqli_warning, next)
125125
}
126126

127127
if (obj->ptr) {
128-
MYSQLI_FETCH_RESOURCE(w, MYSQLI_WARNING *, ZEND_THIS, "mysqli_warning", MYSQLI_STATUS_VALID);
128+
MYSQLI_FETCH_RESOURCE(w, MYSQLI_WARNING *, ZEND_THIS, MYSQLI_STATUS_VALID);
129129

130130
if (w && w->next) {
131131
w = w->next;

‎ext/mysqli/php_mysqli_structs.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
159159
MYSQLI_REGISTER_RESOURCE_EX(__ptr, object)\
160160
}
161161

162-
#define MYSQLI_FETCH_RESOURCE(__ptr, __type, __id, __name, __check) \
162+
#define MYSQLI_FETCH_RESOURCE(__ptr, __type, __id, __check) \
163163
{ \
164164
MYSQLI_RESOURCE *my_res; \
165165
mysqli_object *intern = Z_MYSQLI_P(__id); \
@@ -174,7 +174,7 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
174174
}\
175175
}
176176

177-
#define MYSQLI_FETCH_RESOURCE_BY_OBJ(__ptr, __type, __obj, __name, __check) \
177+
#define MYSQLI_FETCH_RESOURCE_BY_OBJ(__ptr, __type, __obj, __check) \
178178
{ \
179179
MYSQLI_RESOURCE *my_res; \
180180
if (!(my_res = (MYSQLI_RESOURCE *)(__obj->ptr))) {\
@@ -190,7 +190,7 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
190190

191191
#define MYSQLI_FETCH_RESOURCE_CONN(__ptr, __id, __check) \
192192
{ \
193-
MYSQLI_FETCH_RESOURCE((__ptr), MY_MYSQL *, (__id), "mysqli_link", (__check)); \
193+
MYSQLI_FETCH_RESOURCE((__ptr), MY_MYSQL *, (__id), (__check)); \
194194
if (!(__ptr)->mysql) { \
195195
zend_throw_error(NULL, "%s object is not fully initialized", ZSTR_VAL(Z_OBJCE_P(__id)->name)); \
196196
RETURN_THROWS(); \
@@ -199,7 +199,7 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
199199

200200
#define MYSQLI_FETCH_RESOURCE_STMT(__ptr, __id, __check) \
201201
{ \
202-
MYSQLI_FETCH_RESOURCE((__ptr), MY_STMT *, (__id), "mysqli_stmt", (__check)); \
202+
MYSQLI_FETCH_RESOURCE((__ptr), MY_STMT *, (__id), (__check)); \
203203
ZEND_ASSERT((__ptr)->stmt && "Missing statement?"); \
204204
}
205205

0 commit comments

Comments
 (0)