kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/syck/rubyext.c, ext/syck/yaml2byte.c, ext/syck/emitter.c,

Browse source 
ext/syck/syck.c, ext/syck/handler.c, ext/syck/syck.h: suppress GCC
  warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2008-07-22 14:04:10 +00:00
parent 09a5952737
commit d56885b43d
7 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Jul 22 23:01:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
* ext/syck/rubyext.c, ext/syck/yaml2byte.c, ext/syck/emitter.c,
ext/syck/syck.c, ext/syck/handler.c, ext/syck/syck.h: suppress GCC
warning.
Tue Jul 22 20:42:24 2008 Yusuke Endoh <mame@tsg.ne.jp>
* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): BigDecimal#<=> should

4
ext/syck/emitter.c
View file

@ -391,7 +391,7 @@ syck_emit( SyckEmitter *e, st_data_t n )
/* Look for anchor */
if ( e->anchors != NULL &&
st_lookup( e->markers, n, (st_data_t *)&oid ) &&
st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
{
if ( e->anchored == NULL )
{
@ -1217,7 +1217,7 @@ syck_emitter_mark_node( SyckEmitter *e, st_data_t n )
e->anchors = st_init_numtable();
}
if ( ! st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
if ( ! st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
{
int idx = 0;
const char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );

10
ext/syck/handler.c
View file

@ -36,7 +36,7 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
if ( p->bad_anchors != NULL )
{
SyckNode *bad;
if ( st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&bad ) )
if ( st_lookup( p->bad_anchors, (st_data_t)a, (void *)&bad ) )
{
if ( n->kind != syck_str_kind )
{
@ -49,7 +49,7 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
{
p->anchors = st_init_strtable();
}
if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&ntmp ) )
if ( st_lookup( p->anchors, (st_data_t)a, (void *)&ntmp ) )
{
if ( ntmp != (void *)1 )
{
@ -69,7 +69,7 @@ syck_hdlr_remove_anchor( SyckParser *p, char *a )
{
p->anchors = st_init_strtable();
}
if ( st_delete( p->anchors, (st_data_t *)&atmp, (st_data_t *)&ntmp ) )
if ( st_delete( p->anchors, (void *)&atmp, (void *)&ntmp ) )
{
if ( ntmp != (void *)1 )
{
@ -86,7 +86,7 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
if ( p->anchors != NULL )
{
if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&n ) )
if ( st_lookup( p->anchors, (st_data_t)a, (void *)&n ) )
{
if ( n != (void *)1 )
{
@ -99,7 +99,7 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
{
p->bad_anchors = st_init_strtable();
}
if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&n ) )
if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (void *)&n ) )
{
n = (p->bad_anchor_handler)( p, a );
st_insert( p->bad_anchors, (st_data_t)a, (st_data_t)n );

10
ext/syck/rubyext.c
View file

@ -112,7 +112,7 @@ rb_syck_compile(VALUE self, VALUE port)
syck_parser_implicit_typing( parser, 0 );
syck_parser_taguri_expansion( parser, 0 );
oid = syck_parse( parser );
syck_lookup_sym( parser, oid, (char **)&sav );
syck_lookup_sym( parser, oid, &sav );
ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 );
ret[0] = '\0';
@ -927,7 +927,7 @@ VALUE
syck_resolver_node_import(VALUE self, VALUE node)
{
SyckNode *n;
VALUE obj;
VALUE obj = Qnil;
int i = 0;
Data_Get_Struct(node, SyckNode, n);
@ -1376,6 +1376,10 @@ syck_node_mark(SyckNode *n)
rb_gc_mark( syck_map_read( n, map_value, i ) );
}
break;
case syck_str_kind:
/* nothing */
break;
}
#if 0 /* maybe needed */
if ( n->shortcut ) syck_node_mark( n->shortcut ); /* caution: maybe cyclic */
@ -1729,7 +1733,7 @@ VALUE
syck_node_transform(VALUE self)
{
VALUE t;
SyckNode *n;
SyckNode *n = NULL;
SyckNode *orig_n;
Data_Get_Struct(self, SyckNode, orig_n);
t = Data_Wrap_Struct( cNode, syck_node_mark, syck_free_node, 0 );

4
ext/syck/syck.c
View file

@ -190,10 +190,10 @@ syck_add_sym( SyckParser *p, char *data )
}
int
syck_lookup_sym( SyckParser *p, SYMID id, char **data )
syck_lookup_sym( SyckParser *p, SYMID id, void *data )
{
if ( p->syms == NULL ) return 0;
return st_lookup( p->syms, id, (st_data_t *)data );
return st_lookup( p->syms, id, data );
}
int

2
ext/syck/syck.h
View file

@ -349,7 +349,7 @@ char *syck_xprivate( char *, int );
char *syck_taguri( const char *, const char *, int );
int syck_tagcmp( const char *, const char * );
int syck_add_sym( SyckParser *, char * );
int syck_lookup_sym( SyckParser *, SYMID, char ** );
int syck_lookup_sym( SyckParser *, SYMID, void * );
int syck_try_implicit( SyckNode * );
char *syck_type_id_to_uri( char * );
void try_tag_implicit( SyckNode *, int );

8
ext/syck/yaml2byte.c
View file

@ -188,7 +188,7 @@ syck_yaml2byte_handler(p, n)
for ( i = 0; i < n->data.list->idx; i++ )
{
oid = syck_seq_read( n, i );
syck_lookup_sym( p, oid, (char **)&sav );
syck_lookup_sym( p, oid, &sav );
bytestring_extend(val, sav);
}
bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
@ -198,10 +198,10 @@ syck_yaml2byte_handler(p, n)
for ( i = 0; i < n->data.pairs->idx; i++ )
{
oid = syck_map_read( n, map_key, i );
syck_lookup_sym( p, oid, (char **)&sav );
syck_lookup_sym( p, oid, &sav );
bytestring_extend(val, sav);
oid = syck_map_read( n, map_value, i );
syck_lookup_sym( p, oid, (char **)&sav );
syck_lookup_sym( p, oid, &sav );
bytestring_extend(val, sav);
}
bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
@ -227,7 +227,7 @@ syck_yaml2byte(char *yamlstr)
syck_parser_taguri_expansion( parser, 1 );
oid = syck_parse( parser );
if ( syck_lookup_sym( parser, oid, (char **)&sav ) == 1 ) {
if ( syck_lookup_sym( parser, oid, &sav ) == 1 ) {
ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
ret[0] = '\0';
strcat( ret, "D\n" );