Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefix more C functions with rb_mysql_ #910

Merged
merged 3 commits into from
Nov 26, 2017
Merged

Prefix more C functions with rb_mysql_ #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66db2dd
Prefix the methods in statement.c with rb_mysql_
sodabrew Jul 11, 2015
dcd5d12
Prefix the methods in client.c with rb_mysql_
sodabrew Jul 12, 2015
7a684a7
Minor whitespace/variable rewording
sodabrew Jul 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ext/mysql2/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ static int opt_connect_attr_add_i(VALUE key, VALUE value, VALUE arg)
}
#endif

static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags, VALUE conn_attrs) {
static VALUE rb_mysql_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags, VALUE conn_attrs) {
struct nogvl_connect_args args;
time_t start_time, end_time, elapsed_time, connect_timeout;
VALUE rv;
Expand Down Expand Up @@ -754,7 +754,7 @@ static VALUE rb_mysql_client_abandon_results(VALUE self) {
* Query the database with +sql+, with optional +options+. For the possible
* options, see default_query_options on the Mysql2::Client class.
*/
static VALUE rb_query(VALUE self, VALUE sql, VALUE current) {
static VALUE rb_mysql_query(VALUE self, VALUE sql, VALUE current) {
#ifndef _WIN32
struct async_query_args async_args;
#endif
Expand Down Expand Up @@ -1421,8 +1421,8 @@ void init_mysql2_client() {
rb_define_private_method(cMysql2Client, "ssl_mode=", rb_set_ssl_mode_option, 1);
rb_define_private_method(cMysql2Client, "enable_cleartext_plugin=", set_enable_cleartext_plugin, 1);
rb_define_private_method(cMysql2Client, "initialize_ext", initialize_ext, 0);
rb_define_private_method(cMysql2Client, "connect", rb_connect, 8);
rb_define_private_method(cMysql2Client, "_query", rb_query, 2);
rb_define_private_method(cMysql2Client, "connect", rb_mysql_connect, 8);
rb_define_private_method(cMysql2Client, "_query", rb_mysql_query, 2);

sym_id = ID2SYM(rb_intern("id"));
sym_version = ID2SYM(rb_intern("version"));
Expand Down
24 changes: 12 additions & 12 deletions ext/mysql2/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ static void rb_mysql_stmt_mark(void * ptr) {
rb_gc_mark(stmt_wrapper->client);
}

static void *nogvl_stmt_close(void * ptr) {
static void *nogvl_stmt_close(void *ptr) {
mysql_stmt_wrapper *stmt_wrapper = ptr;
if (stmt_wrapper->stmt) {
mysql_stmt_close(stmt_wrapper->stmt);
Expand All @@ -30,7 +30,7 @@ static void *nogvl_stmt_close(void * ptr) {
return NULL;
}

static void rb_mysql_stmt_free(void * ptr) {
static void rb_mysql_stmt_free(void *ptr) {
mysql_stmt_wrapper *stmt_wrapper = ptr;
decr_mysql2_stmt(stmt_wrapper);
}
Expand Down Expand Up @@ -145,7 +145,7 @@ VALUE rb_mysql_stmt_new(VALUE rb_client, VALUE sql) {
*
* Returns the number of parameters the prepared statement expects.
*/
static VALUE param_count(VALUE self) {
static VALUE rb_mysql_stmt_param_count(VALUE self) {
GET_STATEMENT(self);

return ULL2NUM(mysql_stmt_param_count(stmt_wrapper->stmt));
Expand All @@ -155,13 +155,13 @@ static VALUE param_count(VALUE self) {
*
* Returns the number of fields the prepared statement returns.
*/
static VALUE field_count(VALUE self) {
static VALUE rb_mysql_stmt_field_count(VALUE self) {
GET_STATEMENT(self);

return UINT2NUM(mysql_stmt_field_count(stmt_wrapper->stmt));
}

static void *nogvl_execute(void *ptr) {
static void *nogvl_stmt_execute(void *ptr) {
MYSQL_STMT *stmt = ptr;

if (mysql_stmt_execute(stmt)) {
Expand Down Expand Up @@ -246,7 +246,7 @@ static int my_big2ll(VALUE bignum, LONG_LONG *ptr)
*
* Executes the current prepared statement, returns +result+.
*/
static VALUE execute(int argc, VALUE *argv, VALUE self) {
static VALUE rb_mysql_stmt_execute(int argc, VALUE *argv, VALUE self) {
MYSQL_BIND *bind_buffers = NULL;
unsigned long *length_buffers = NULL;
unsigned long bind_count;
Expand Down Expand Up @@ -401,7 +401,7 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
}
}

if ((VALUE)rb_thread_call_without_gvl(nogvl_execute, stmt, RUBY_UBF_IO, 0) == Qfalse) {
if ((VALUE)rb_thread_call_without_gvl(nogvl_stmt_execute, stmt, RUBY_UBF_IO, 0) == Qfalse) {
FREE_BINDS;
rb_raise_mysql2_stmt_error(stmt_wrapper);
}
Expand Down Expand Up @@ -449,7 +449,7 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
*
* Returns a list of fields that will be returned by this statement.
*/
static VALUE fields(VALUE self) {
static VALUE rb_mysql_stmt_fields(VALUE self) {
MYSQL_FIELD *fields;
MYSQL_RES *metadata;
unsigned int field_count;
Expand Down Expand Up @@ -542,10 +542,10 @@ static VALUE rb_mysql_stmt_close(VALUE self) {
void init_mysql2_statement() {
cMysql2Statement = rb_define_class_under(mMysql2, "Statement", rb_cObject);

rb_define_method(cMysql2Statement, "param_count", param_count, 0);
rb_define_method(cMysql2Statement, "field_count", field_count, 0);
rb_define_method(cMysql2Statement, "_execute", execute, -1);
rb_define_method(cMysql2Statement, "fields", fields, 0);
rb_define_method(cMysql2Statement, "param_count", rb_mysql_stmt_param_count, 0);
rb_define_method(cMysql2Statement, "field_count", rb_mysql_stmt_field_count, 0);
rb_define_method(cMysql2Statement, "_execute", rb_mysql_stmt_execute, -1);
rb_define_method(cMysql2Statement, "fields", rb_mysql_stmt_fields, 0);
rb_define_method(cMysql2Statement, "last_id", rb_mysql_stmt_last_id, 0);
rb_define_method(cMysql2Statement, "affected_rows", rb_mysql_stmt_affected_rows, 0);
rb_define_method(cMysql2Statement, "close", rb_mysql_stmt_close, 0);
Expand Down