Annotation of pkgsrc/databases/ruby-sqlite/patches/patch-aa, revision 1.2
1.2 ! taca 1: $NetBSD: patch-aa,v 1.1 2010/09/10 04:52:59 taca Exp $
1.1 taca 2:
1.2 ! taca 3: * Use Modern Ruby API.
! 4: * Avoid use of rb_cData for Ruby 3.2.
! 5:
! 6: --- ext/sqlite-api.c.orig 2023-01-30 13:22:14.778692763 +0000
1.1 taca 7: +++ ext/sqlite-api.c
8: @@ -270,7 +270,7 @@ static_api_open( VALUE module, VALUE fil
9: Check_Type( file_name, T_STRING );
10: Check_Type( mode, T_FIXNUM );
11:
12: - s_file_name = STR2CSTR( file_name );
13: + s_file_name = StringValuePtr( file_name );
14: i_mode = FIX2INT( mode );
15:
16: db = sqlite_open( s_file_name, i_mode, &errmsg );
1.2 ! taca 17: @@ -280,7 +280,7 @@ static_api_open( VALUE module, VALUE fil
! 18: /* "raise" does not return */
! 19: }
! 20:
! 21: - return Data_Wrap_Struct( rb_cData, NULL, sqlite_close, db );
! 22: + return Data_Wrap_Struct( rb_cObject, NULL, sqlite_close, db );
! 23: }
! 24:
! 25: /**
1.1 taca 26: @@ -329,7 +329,7 @@ static_api_compile( VALUE module, VALUE
27: Check_Type( sql, T_STRING );
28:
29: result = sqlite_compile( handle,
30: - STR2CSTR( sql ),
31: + StringValuePtr( sql ),
32: &sql_tail,
33: &vm,
34: &errmsg );
1.2 ! taca 35: @@ -341,7 +341,7 @@ static_api_compile( VALUE module, VALUE
! 36: }
! 37:
! 38: tuple = rb_ary_new();
! 39: - rb_ary_push( tuple, Data_Wrap_Struct( rb_cData, NULL, static_free_vm, vm ) );
! 40: + rb_ary_push( tuple, Data_Wrap_Struct( rb_cObject, NULL, static_free_vm, vm ) );
! 41: rb_ary_push( tuple, rb_str_new2( sql_tail ) );
! 42:
! 43: return tuple;
1.1 taca 44: @@ -545,7 +545,7 @@ static VALUE
45: static_api_complete( VALUE module, VALUE sql )
46: {
47: Check_Type( sql, T_STRING );
48: - return ( sqlite_complete( STR2CSTR( sql ) ) ? Qtrue : Qfalse );
49: + return ( sqlite_complete( StringValuePtr( sql ) ) ? Qtrue : Qfalse );
50: }
51:
52: /**
53: @@ -780,8 +780,8 @@ static_api_set_result( VALUE module, VAL
54: {
55: case T_STRING:
56: sqlite_set_result_string( func_ptr,
57: - RSTRING(result)->ptr,
58: - RSTRING(result)->len );
59: + RSTRING_PTR(result),
60: + RSTRING_LEN(result) );
61: break;
62:
63: case T_FIXNUM:
64: @@ -817,8 +817,8 @@ static_api_set_result_error( VALUE modul
65: GetFunc( func_ptr, func );
66: Check_Type( string, T_STRING );
67:
68: - sqlite_set_result_error( func_ptr, RSTRING(string)->ptr,
69: - RSTRING(string)->len );
70: + sqlite_set_result_error( func_ptr, RSTRING_PTR(string),
71: + RSTRING_LEN(string) );
72:
73: return string;
74: }
75: @@ -1188,7 +1188,7 @@ static_raise_db_error2( int code, char *
76: if( *msg ) free( *msg );
77: *msg = NULL;
78:
79: - static_raise_db_error( code, "%s", STR2CSTR( err ) );
80: + static_raise_db_error( code, "%s", StringValuePtr( err ) );
81: }
82:
83: static void
1.2 ! taca 84: @@ -1241,7 +1241,7 @@ static_function_callback( sqlite_func *f
! 85: proc = rb_ary_entry( proc, 0 );
! 86:
! 87: args = rb_ary_new2( argc + 1 );
! 88: - rb_ary_push( args, Data_Wrap_Struct( rb_cData, NULL, NULL, func ) );
! 89: + rb_ary_push( args, Data_Wrap_Struct( rb_cObject, NULL, NULL, func ) );
! 90:
! 91: for( index = 0; index < argc; index++ )
! 92: {
! 93: @@ -1273,7 +1273,7 @@ static_aggregate_finalize_callback( sqli
! 94: int exception = 0;
! 95:
! 96: proc = rb_ary_entry( (VALUE)sqlite_user_data( func ), 1 );
! 97: - args = rb_ary_new3( 1, Data_Wrap_Struct( rb_cData, NULL, NULL, func ) );
! 98: + args = rb_ary_new3( 1, Data_Wrap_Struct( rb_cObject, NULL, NULL, func ) );
! 99:
! 100: protect_args = rb_ary_new3( 2, proc, args );
! 101:
CVSweb <webmaster@jp.NetBSD.org>