Skip to content

Commit 1e42ae1

Browse files
kocsismatekocsismate
committed
Rename MYSQLI_RETURN_RESOURCE() to MYSQLI_RETVAL_RESOURCE
Since it doesn't return in fact.
1 parent 53b46a5 commit 1e42ae1

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

‎ext/mysqli/mysqli_api.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, bool is_method)
15061506
mysqli_resource->status = MYSQLI_STATUS_INITIALIZED;
15071507

15081508
if (!is_method) {
1509-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);
1509+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_link_class_entry);
15101510
} else {
15111511
(Z_MYSQLI_P(getThis()))->ptr = mysqli_resource;
15121512
}
@@ -1887,7 +1887,7 @@ PHP_FUNCTION(mysqli_prepare)
18871887

18881888
/* change status */
18891889
mysqli_resource->status = MYSQLI_STATUS_VALID;
1890-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_stmt_class_entry);
1890+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_stmt_class_entry);
18911891
}
18921892
/* }}} */
18931893

@@ -2432,7 +2432,7 @@ PHP_FUNCTION(mysqli_stmt_init)
24322432
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
24332433
mysqli_resource->status = MYSQLI_STATUS_INITIALIZED;
24342434
mysqli_resource->ptr = (void *)stmt;
2435-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_stmt_class_entry);
2435+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_stmt_class_entry);
24362436
}
24372437
/* }}} */
24382438

@@ -2480,7 +2480,7 @@ PHP_FUNCTION(mysqli_stmt_result_metadata)
24802480
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
24812481
mysqli_resource->ptr = (void *)result;
24822482
mysqli_resource->status = MYSQLI_STATUS_VALID;
2483-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
2483+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_result_class_entry);
24842484
}
24852485
/* }}} */
24862486

@@ -2569,7 +2569,7 @@ PHP_FUNCTION(mysqli_store_result)
25692569
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
25702570
mysqli_resource->ptr = (void *)result;
25712571
mysqli_resource->status = MYSQLI_STATUS_VALID;
2572-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
2572+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_result_class_entry);
25732573
}
25742574
/* }}} */
25752575

@@ -2623,7 +2623,7 @@ PHP_FUNCTION(mysqli_use_result)
26232623
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
26242624
mysqli_resource->ptr = (void *)result;
26252625
mysqli_resource->status = MYSQLI_STATUS_VALID;
2626-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
2626+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_result_class_entry);
26272627
}
26282628
/* }}} */
26292629

‎ext/mysqli/mysqli_nonapi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
360360
(Z_MYSQLI_P(object))->ptr = mysqli_resource;
361361
RETURN_TRUE;
362362
} else {
363-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);
363+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_link_class_entry);
364364
if (is_real_connect) {
365365
zval_ptr_dtor(return_value);
366366
RETURN_TRUE;
@@ -761,7 +761,7 @@ PHP_FUNCTION(mysqli_query)
761761
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
762762
mysqli_resource->ptr = (void *)result;
763763
mysqli_resource->status = MYSQLI_STATUS_VALID;
764-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
764+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_result_class_entry);
765765
}
766766
/* }}} */
767767

@@ -995,7 +995,7 @@ PHP_FUNCTION(mysqli_reap_async_query)
995995
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
996996
mysqli_resource->ptr = (void *)result;
997997
mysqli_resource->status = MYSQLI_STATUS_VALID;
998-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
998+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_result_class_entry);
999999
}
10001000
/* }}} */
10011001

@@ -1020,7 +1020,7 @@ PHP_FUNCTION(mysqli_stmt_get_result)
10201020
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
10211021
mysqli_resource->ptr = (void *)result;
10221022
mysqli_resource->status = MYSQLI_STATUS_VALID;
1023-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
1023+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_result_class_entry);
10241024
}
10251025
/* }}} */
10261026
#endif
@@ -1051,7 +1051,7 @@ PHP_FUNCTION(mysqli_get_warnings)
10511051
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
10521052
mysqli_resource->ptr = mysqli_resource->info = (void *)w;
10531053
mysqli_resource->status = MYSQLI_STATUS_VALID;
1054-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_warning_class_entry);
1054+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_warning_class_entry);
10551055
}
10561056
/* }}} */
10571057

@@ -1077,7 +1077,7 @@ PHP_FUNCTION(mysqli_stmt_get_warnings)
10771077
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
10781078
mysqli_resource->ptr = mysqli_resource->info = (void *)w;
10791079
mysqli_resource->status = MYSQLI_STATUS_VALID;
1080-
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_warning_class_entry);
1080+
MYSQLI_RETVAL_RESOURCE(mysqli_resource, mysqli_warning_class_entry);
10811081
}
10821082
/* }}} */
10831083

‎ext/mysqli/php_mysqli_structs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
190190
#define MYSQLI_REGISTER_RESOURCE_EX(__ptr, __zval) \
191191
(Z_MYSQLI_P(__zval))->ptr = __ptr;
192192

193-
#define MYSQLI_RETURN_RESOURCE(__ptr, __ce) \
193+
#define MYSQLI_RETVAL_RESOURCE(__ptr, __ce) \
194194
RETVAL_OBJ(mysqli_objects_new(__ce)); \
195195
MYSQLI_REGISTER_RESOURCE_EX(__ptr, return_value)
196196

0 commit comments

Comments
 (0)