Skip to content

Commit 885dca3

Browse files
committed
Remove mysqlnd_unbuffered_skip_result and voidify skip_result
1 parent ad5f471 commit 885dca3

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

ext/mysqlnd/mysqlnd.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ PHPAPI void mysqlnd_debug(const char *mode);
109109
#define mysqlnd_query(conn, query_str, query_len) ((conn)->data)->m->query((conn)->data, (query_str), (query_len))
110110
#define mysqlnd_async_query(conn, query_str, query_len) ((conn)->data)->m->send_query((conn)->data, (query_str), (query_len), NULL, NULL)
111111
#define mysqlnd_reap_async_query(conn) ((conn)->data)->m->reap_query((conn)->data)
112-
#define mysqlnd_unbuffered_skip_result(result) (result)->m.skip_result((result))
113112

114113
PHPAPI enum_func_status mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, int * desc_num);
115114

ext/mysqlnd/mysqlnd_result.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
781781

782782

783783
/* {{{ mysqlnd_res::skip_result */
784-
static enum_func_status
784+
static void
785785
MYSQLND_METHOD(mysqlnd_res, skip_result)(MYSQLND_RES * const result)
786786
{
787787
bool fetched_anything;
@@ -806,7 +806,7 @@ MYSQLND_METHOD(mysqlnd_res, skip_result)(MYSQLND_RES * const result)
806806
? STAT_ROWS_SKIPPED_NORMAL : STAT_ROWS_SKIPPED_PS);
807807
}
808808
}
809-
DBG_RETURN(PASS);
809+
DBG_VOID_RETURN;
810810
}
811811
/* }}} */
812812

ext/mysqlnd/mysqlnd_structs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, const unsi
632632
typedef MYSQLND_ROW_C (*func_mysqlnd_res__fetch_row_c)(MYSQLND_RES *result);
633633
typedef uint64_t (*func_mysqlnd_res__num_rows)(const MYSQLND_RES * const result);
634634
typedef unsigned int (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result);
635-
typedef enum_func_status (*func_mysqlnd_res__skip_result)(MYSQLND_RES * const result);
635+
typedef void (*func_mysqlnd_res__skip_result)(MYSQLND_RES * const result);
636636
typedef enum_func_status (*func_mysqlnd_res__seek_data)(MYSQLND_RES * const result, const uint64_t row);
637637
typedef MYSQLND_FIELD_OFFSET (*func_mysqlnd_res__seek_field)(MYSQLND_RES * const result, const MYSQLND_FIELD_OFFSET field_offset);
638638
typedef MYSQLND_FIELD_OFFSET (*func_mysqlnd_res__field_tell)(const MYSQLND_RES * const result);

0 commit comments

Comments
 (0)