diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/digest/sha2/sha2.c | 2 | ||||
| -rw-r--r-- | ext/syck/rubyext.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c index 24a57ded0..41ed2df10 100644 --- a/ext/digest/sha2/sha2.c +++ b/ext/digest/sha2/sha2.c @@ -67,7 +67,7 @@ typedef uint8_t sha2_byte; /* Exactly 1 byte */ typedef uint32_t sha2_word32; /* Exactly 4 bytes */ typedef uint64_t sha2_word64; /* Exactly 8 bytes */ -#if defined(__GNUC__) || defined(_HPUX_SOURCE) +#if defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__) #define ULL(number) number##ULL #else #define ULL(number) (uint64_t)(number) diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index 272cfd257..f75e3ca56 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -115,14 +115,15 @@ rb_syck_compile(self, port) oid = syck_parse( parser ); syck_lookup_sym( parser, oid, (char **)&sav ); - ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 ); + bc = rb_str_new(0, strlen( sav->buffer ) + 3); + ret = RSTRING(bc)->ptr; ret[0] = '\0'; strcat( ret, "D\n" ); strcat( ret, sav->buffer ); syck_free_parser( parser ); - bc = rb_str_new2( ret ); S_FREE( ret ); + rb_str_resize( bc, strlen(ret) ); if ( taint ) OBJ_TAINT( bc ); return bc; } @@ -1042,13 +1043,13 @@ syck_set_ivars( vars, obj ) { VALUE ivname = rb_ary_entry( vars, 0 ); char *ivn; + ID ivns; StringValue( ivname ); ivn = S_ALLOC_N( char, RSTRING(ivname)->len + 2 ); - ivn[0] = '@'; - ivn[1] = '\0'; - strncat( ivn, RSTRING(ivname)->ptr, RSTRING(ivname)->len ); - rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) ); + snprintf(ivn, RSTRING(ivname)->len + 1, "@%s", RSTRING(ivname)->ptr); + ivns = rb_intern(ivn); S_FREE( ivn ); + rb_ivar_set( obj, ivns, rb_ary_entry( vars, 1 ) ); return Qnil; } |