Skip to content

Support for Ruby 3.x #4

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

Merged
merged 1 commit into from
Jul 10, 2023
Merged

Support for Ruby 3.x #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 25 additions & 25 deletions ext/odbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ uc_tainted_str_new(SQLWCHAR *str, int len)
if ((cp != NULL) && (str != NULL)) {
ulen = mkutf(cp, str, len);
}
v = rb_tainted_str_new((cp != NULL) ? cp : "", ulen);
v = rb_str_new((cp != NULL) ? cp : "", ulen);
#ifdef USE_RB_ENC
rb_enc_associate(v, rb_enc);
#endif
Expand Down Expand Up @@ -679,11 +679,11 @@ uc_free(SQLWCHAR *str)
#endif

static VALUE
utf8_tainted_str_new(SQLCHAR *str, int len)
utf8_str_new(SQLCHAR *str, int len)
{
VALUE v;

v = rb_tainted_str_new(str, len);
v = rb_str_new(str, len);

#ifdef USE_RB_ENC
if(rb_encoding_is_utf8)
Expand Down Expand Up @@ -1016,7 +1016,7 @@ set_err(const char *msg, int warn)
rb_enc_associate(v, rb_enc);
#endif
a = rb_ary_new2(1);
rb_ary_push(a, rb_obj_taint(v));
rb_ary_push(a, v);
CVAR_SET(Cobj, warn ? IDatatinfo : IDataterror, a);
return STR2CSTR(v);
}
Expand Down Expand Up @@ -1094,7 +1094,7 @@ get_err_or_info(SQLHENV henv, SQLHDBC hdbc, SQLHSTMT hstmt, int isinfo)
v0 = v;
a = rb_ary_new();
}
rb_ary_push(a, rb_obj_taint(v));
rb_ary_push(a, v);
tracemsg(1, fprintf(stderr, " | %s\n", STR2CSTR(v)););
}
}
Expand Down Expand Up @@ -1190,7 +1190,7 @@ get_installer_err()
v0 = v;
a = rb_ary_new();
}
rb_ary_push(a, rb_obj_taint(v));
rb_ary_push(a, v);
tracemsg(1, fprintf(stderr, " | %s\n", STR2CSTR(v)););
}
}
Expand Down Expand Up @@ -1445,7 +1445,7 @@ dbc_raise(VALUE self, VALUE msg)
buf[SQL_MAX_MESSAGE_LENGTH] = '\0';
v = rb_str_new2(buf);
a = rb_ary_new2(1);
rb_ary_push(a, rb_obj_taint(v));
rb_ary_push(a, v);
CVAR_SET(Cobj, IDataterror, a);
rb_raise(Cerror, "%s", buf);
return Qnil;
Expand Down Expand Up @@ -1535,8 +1535,8 @@ dbc_dsns(VALUE self)
#else
dsnLen = (dsnLen == 0) ? (SQLSMALLINT) strlen(dsn) : dsnLen;
descrLen = (descrLen == 0) ? (SQLSMALLINT) strlen(descr) : descrLen;
rb_iv_set(odsn, "@name", rb_tainted_str_new(dsn, dsnLen));
rb_iv_set(odsn, "@descr", rb_tainted_str_new(descr, descrLen));
rb_iv_set(odsn, "@name", rb_str_new(dsn, dsnLen));
rb_iv_set(odsn, "@descr", rb_str_new(descr, descrLen));
#endif
rb_ary_push(aret, odsn);
first = dsnLen = descrLen = 0;
Expand Down Expand Up @@ -1600,13 +1600,13 @@ dbc_drivers(VALUE self)
}
#else
driverLen = (driverLen == 0) ? (SQLSMALLINT) strlen(driver) : driverLen;
rb_iv_set(odrv, "@name", rb_tainted_str_new(driver, driverLen));
rb_iv_set(odrv, "@name", rb_str_new(driver, driverLen));
for (attr = attrs; *attr; attr += strlen(attr) + 1) {
char *p = strchr(attr, '=');

if ((p != NULL) && (p != attr)) {
rb_hash_aset(h, rb_tainted_str_new(attr, p - attr),
rb_tainted_str_new2(p + 1));
rb_hash_aset(h, rb_str_new(attr, p - attr),
rb_str_new2(p + 1));
count++;
}
}
Expand Down Expand Up @@ -1915,7 +1915,7 @@ dbc_rfdsn(int argc, VALUE *argv, VALUE self)
if (SQLReadFileDSN((LPCSTR) sfname, (LPCSTR) saname,
(LPCSTR) skname, (LPSTR) valbuf,
sizeof (valbuf), NULL)) {
return rb_tainted_str_new2((char *) valbuf);
return rb_str_new2((char *) valbuf);
}
}
#else
Expand All @@ -1925,7 +1925,7 @@ dbc_rfdsn(int argc, VALUE *argv, VALUE self)
valbuf[0] = '\0';
if (SQLReadFileDSN(sfname, saname, skname, valbuf,
sizeof (valbuf), NULL)) {
return rb_tainted_str_new2(valbuf);
return rb_str_new2(valbuf);
}
#endif
#if defined(HAVE_SQLINSTALLERERROR) || (defined(UNICODE) && defined(HAVE_SQLINSTALLERERRORW))
Expand Down Expand Up @@ -3707,7 +3707,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
len = 0;
}
mkutf(tmp, name, len);
v = rb_tainted_str_new2(upcase_if(tmp, 1));
v = rb_str_new2(upcase_if(tmp, 1));
#ifdef USE_RB_ENC
rb_enc_associate(v, rb_enc);
#endif
Expand All @@ -3719,7 +3719,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
rb_iv_set(obj, "@name", uc_tainted_str_new2(name));
}
#else
rb_iv_set(obj, "@name", rb_tainted_str_new2(upcase_if(name, upc)));
rb_iv_set(obj, "@name", rb_str_new2(upcase_if(name, upc)));
#endif
v = Qnil;
name[0] = 0;
Expand All @@ -3737,7 +3737,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
#ifdef UNICODE
v = uc_tainted_str_new2(name);
#else
v = rb_tainted_str_new2(name);
v = rb_str_new2(name);
#endif
}
rb_iv_set(obj, "@table", v);
Expand Down Expand Up @@ -5816,7 +5816,7 @@ stmt_param_output_value(int argc, VALUE *argv, VALUE self)
break;
#endif
case SQL_C_CHAR:
v = utf8_tainted_str_new(q->paraminfo[vnum].outbuf,
v = utf8_str_new(q->paraminfo[vnum].outbuf,
q->paraminfo[vnum].rlen);
break;
}
Expand Down Expand Up @@ -5892,7 +5892,7 @@ stmt_cursorname(int argc, VALUE *argv, VALUE self)
return uc_tainted_str_new(cname, cnLen);
#else
cnLen = (cnLen == 0) ? (SQLSMALLINT) strlen((char *) cname) : cnLen;
return rb_tainted_str_new((char *) cname, cnLen);
return rb_str_new((char *) cname, cnLen);
#endif
}
if (TYPE(cn) != T_STRING) {
Expand Down Expand Up @@ -5978,7 +5978,7 @@ stmt_columns(int argc, VALUE *argv, VALUE self)

sprintf(buf, "#%d", i);
name = rb_str_dup(name);
name = rb_obj_taint(rb_str_cat2(name, buf));
name = rb_str_cat2(name, buf);
}
rb_hash_aset(res, name, obj);
}
Expand Down Expand Up @@ -6227,15 +6227,15 @@ do_fetch(STMT *q, int mode)
}
for (i = 0; i < 4 * q->ncols; i++) {
res = colbuf[i / q->ncols];
cname = rb_tainted_str_new2(q->colnames[i]);
cname = rb_str_new2(q->colnames[i]);
#ifdef USE_RB_ENC
rb_enc_associate(cname, rb_enc);
#endif
q->colvals[i] = cname;
if (rb_funcall(res, IDkeyp, 1, cname) == Qtrue) {
char *p;

cname = rb_tainted_str_new2(q->colnames[i]);
cname = rb_str_new2(q->colnames[i]);
#ifdef USE_RB_ENC
rb_enc_associate(cname, rb_enc);
#endif
Expand Down Expand Up @@ -6476,7 +6476,7 @@ do_fetch(STMT *q, int mode)
break;
#endif
default:
v = utf8_tainted_str_new(valp, curlen);
v = utf8_str_new(valp, curlen);
break;
}
}
Expand All @@ -6489,14 +6489,14 @@ do_fetch(STMT *q, int mode)
valp = q->colnames[i + offc];
name = (q->colvals == NULL) ? Qnil : q->colvals[i + offc];
if (name == Qnil) {
name = rb_tainted_str_new2(valp);
name = rb_str_new2(valp);
#ifdef USE_RB_ENC
rb_enc_associate(name, rb_enc);
#endif
if (rb_funcall(res, IDkeyp, 1, name) == Qtrue) {
char *p;

name = rb_tainted_str_new2(valp);
name = rb_str_new2(valp);
#ifdef USE_RB_ENC
rb_enc_associate(name, rb_enc);
#endif
Expand Down