* ext/syck: suppress warnings more.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,7 @@
+Wed Jul 23 06:11:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck: suppress warnings more.
+
 Wed Jul 23 04:18:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/syck: suppress warnings.

ext/syck/bytecode.c

@@ -165,7 +165,7 @@ sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
 #line 165 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy0;
 	++YYCURSOR;
 yy0:
@@ -543,7 +543,7 @@ Directive:
 #line 543 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy45;
 	++YYCURSOR;
 yy45:

ext/syck/emitter.c

@@ -285,7 +285,7 @@ void
 syck_emitter_write( SyckEmitter *e, const char *str, long len )
 {
     long at;
-    ASSERT( str != NULL )
+    ASSERT( str != NULL );
     if ( e->buffer == NULL )
     {
         syck_emitter_clear( e );

ext/syck/handler.c

@@ -145,7 +145,7 @@ syck_add_transfer( char *uri, SyckNode *n, int taguri )
 }
 
 char *
-syck_xprivate( char *type_id, int type_len )
+syck_xprivate( const char *type_id, int type_len )
 {
     char *uri = S_ALLOC_N( char, type_len + 14 );
     uri[0] = '\0';

ext/syck/implicit.c

@@ -48,7 +48,7 @@ try_tag_implicit( SyckNode *n, int taguri )
 const char *
 syck_match_implicit( const char *str, size_t len )
 {
-    const char *cursor, *limit, *marker;
+    const char *cursor, *limit, *marker = 0;
     cursor = str;
     limit = str + len;
 
@@ -1610,9 +1610,9 @@ syck_tagcmp( const char *tag1, const char *tag2 )
 }
 
 char *
-syck_type_id_to_uri( char *type_id )
+syck_type_id_to_uri( const char *type_id )
 {
-    char *cursor, *limit, *marker;
+    const char *cursor, *limit, *marker;
 
     cursor = type_id;
     limit = type_id + strlen( type_id );
@@ -1621,7 +1621,7 @@ syck_type_id_to_uri( char *type_id )
 #line 1620 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy202;
 	++YYCURSOR;
 yy202:

ext/syck/rubyext.c

@@ -104,7 +104,7 @@ rb_syck_compile(self, port)
     int taint;
     char *ret;
     VALUE bc;
-    bytestring_t *sav;
+    bytestring_t *sav = NULL;
     void *data;
 
     SyckParser *parser = syck_new_parser();
@@ -2146,9 +2146,7 @@ syck_out_scalar( argc, argv, self )
     VALUE self;
 {
     VALUE type_id, str, style, scalar;
-    if (rb_scan_args(argc, argv, "21", &type_id, &str, &style) == 2) {
+    rb_scan_args(argc, argv, "21", &type_id, &str, &style);
-        style = Qnil;
-    }
     scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
     syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
     return scalar;

ext/syck/syck.c

@@ -19,11 +19,11 @@ void syck_parser_pop_level( SyckParser * );
  * Custom assert
  */
 void 
-syck_assert( char *file_name, unsigned line_num )
+syck_assert( const char *file_name, unsigned line_num, const char *expr )
 {
     fflush( NULL );
-    fprintf( stderr, "\nAssertion failed: %s, line %u\n",
+    fprintf( stderr, "\nAssertion failed: %s, line %u: %s\n",
-             file_name, line_num );
+             file_name, line_num, expr );
     fflush( stderr );
     abort();
 }

ext/syck/syck.h

@@ -33,14 +33,11 @@ extern "C" {
 #endif
 
 #if DEBUG
-  void syck_assert( char *, unsigned );
+void syck_assert( const char *, unsigned, const char * );
 # define ASSERT(f) \
-    if ( f ) \
+    (( f ) ? (void)0 syck_assert( __FILE__, __LINE__, #f )
-        {}   \
-    else     \
-        syck_assert( __FILE__, __LINE__ )
 #else
-# define ASSERT(f)
+# define ASSERT(f) ((void)0)
 #endif
 
 #ifndef NULL
@@ -346,13 +343,13 @@ SyckNode *syck_hdlr_add_anchor( SyckParser *, char *, SyckNode * );
 void syck_hdlr_remove_anchor( SyckParser *, char * );
 SyckNode *syck_hdlr_get_anchor( SyckParser *, char * );
 void syck_add_transfer( char *, SyckNode *, int );
-char *syck_xprivate( char *, int );
+char *syck_xprivate( const char *, int );
 char *syck_taguri( const char *, const char *, int );
 int syck_tagcmp( const char *, const char * );
 int syck_add_sym( SyckParser *, void * );
 int syck_lookup_sym( SyckParser *, SYMID, void ** );
 int syck_try_implicit( SyckNode * );
-char *syck_type_id_to_uri( char * );
+char *syck_type_id_to_uri( const char * );
 void try_tag_implicit( SyckNode *, int );
 const char *syck_match_implicit( const char *, size_t );
 

ext/syck/token.c

@@ -1117,7 +1117,7 @@ Directive:
 #line 1117 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy94;
 	++YYCURSOR;
 yy94: