summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-13 11:41:19 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-13 11:41:19 +0000
commit43b1770ed6debca4a3f037b787497e82241b493d (patch)
tree1bed68031a96ea82bee923daa4775757c3c6bdfb
parente4ada45df17a2ccda0073db6fc586ee1641337e4 (diff)
* ext/syck/handler.c: add proper casts.
* ext/syck/syck.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/syck/handler.c4
-rw-r--r--ext/syck/syck.c8
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2eedfd27e0..145f428a97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ Tue May 13 20:31:58 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in: add '-D_USE_CRTIMP' to XCFLAGS on MinGW.
+ * ext/syck/handler.c: add proper casts.
+
+ * ext/syck/syck.c: ditto.
+
Tue May 13 17:58:08 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
index 7a914b5ad1..7b7b4c723b 100644
--- a/ext/syck/handler.c
+++ b/ext/syck/handler.c
@@ -30,7 +30,7 @@ SyckNode *
syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
{
n->anchor = a;
- st_insert( p->anchors, a, n );
+ st_insert( p->anchors, (st_data_t)a, (st_data_t)n );
return n;
}
@@ -39,7 +39,7 @@ syck_hdlr_add_alias( SyckParser *p, char *a )
{
SyckNode *n;
- if ( st_lookup( p->anchors, a, &n ) )
+ if ( st_lookup( p->anchors, (st_data_t)a, &n ) )
{
return n;
}
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
index 180d40ba18..76edc902d0 100644
--- a/ext/syck/syck.c
+++ b/ext/syck/syck.c
@@ -166,7 +166,7 @@ syck_add_sym( SyckParser *p, char *data )
p->syms = st_init_numtable();
}
id = p->syms->num_entries;
- st_insert( p->syms, id, data );
+ st_insert( p->syms, id, (st_data_t)data );
return id;
}
@@ -174,10 +174,10 @@ int
syck_lookup_sym( SyckParser *p, SYMID id, char **data )
{
if ( p->syms == NULL ) return 0;
- return st_lookup( p->syms, id, data );
+ return st_lookup( p->syms, id, (st_data_t *)data );
}
-enum st_retval
+int
syck_st_free_nodes( char *key, SyckNode *n, char *arg )
{
syck_free_node( n );
@@ -201,7 +201,7 @@ syck_free_parser( SyckParser *p )
//
// Free the anchor table
//
- st_foreach( p->anchors, syck_st_free_nodes, NULL );
+ st_foreach( p->anchors, syck_st_free_nodes, 0 );
st_free_table( p->anchors );
//