[前][次][番号順一覧][スレッド一覧]

ruby-changes:6660

From: nobu <ko1@a...>
Date: Wed, 23 Jul 2008 06:12:28 +0900 (JST)
Subject: [ruby-changes:6660] Ruby:r18176 (trunk, ruby_1_8): * ext/syck: suppress warnings more.

nobu	2008-07-23 06:12:00 +0900 (Wed, 23 Jul 2008)

  New Revision: 18176

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18176

  Log:
    * ext/syck: suppress warnings more.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/syck/bytecode.c
    branches/ruby_1_8/ext/syck/emitter.c
    branches/ruby_1_8/ext/syck/handler.c
    branches/ruby_1_8/ext/syck/implicit.c
    branches/ruby_1_8/ext/syck/rubyext.c
    branches/ruby_1_8/ext/syck/syck.c
    branches/ruby_1_8/ext/syck/syck.h
    branches/ruby_1_8/ext/syck/token.c
    trunk/ChangeLog
    trunk/ext/syck/bytecode.c
    trunk/ext/syck/emitter.c
    trunk/ext/syck/handler.c
    trunk/ext/syck/implicit.c
    trunk/ext/syck/rubyext.c
    trunk/ext/syck/syck.c
    trunk/ext/syck/syck.h
    trunk/ext/syck/token.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18175)
+++ ChangeLog	(revision 18176)
@@ -1,3 +1,7 @@
+Wed Jul 23 06:11:58 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/syck: suppress warnings more.
+
 Wed Jul 23 03:19:31 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/nkf/nkf-utf8/nkf.c (struct input_code.name, input_codename):
Index: ext/syck/bytecode.c
===================================================================
--- ext/syck/bytecode.c	(revision 18175)
+++ ext/syck/bytecode.c	(revision 18176)
@@ -164,7 +164,7 @@
 #line 165 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy0;
 	++YYCURSOR;
 yy0:
@@ -542,7 +542,7 @@
 #line 543 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy45;
 	++YYCURSOR;
 yy45:
Index: ext/syck/rubyext.c
===================================================================
--- ext/syck/rubyext.c	(revision 18175)
+++ ext/syck/rubyext.c	(revision 18176)
@@ -103,7 +103,7 @@
     int taint;
     char *ret;
     VALUE bc;
-    bytestring_t *sav;
+    bytestring_t *sav = NULL;
     void *data;
 
     SyckParser *parser = syck_new_parser();
@@ -2055,9 +2055,7 @@
 syck_out_scalar(int argc, VALUE *argv, VALUE self)
 {
     VALUE type_id, str, style, scalar;
-    if (rb_scan_args(argc, argv, "21", &type_id, &str, &style) == 2) {
-        style = Qnil;
-    }
+    rb_scan_args(argc, argv, "21", &type_id, &str, &style);
     scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
     syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
     return scalar;
Index: ext/syck/syck.c
===================================================================
--- ext/syck/syck.c	(revision 18175)
+++ ext/syck/syck.c	(revision 18176)
@@ -18,11 +18,11 @@
  * 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",
-             file_name, line_num );
+    fprintf( stderr, "\nAssertion failed: %s, line %u: %s\n",
+             file_name, line_num, expr );
     fflush( stderr );
     abort();
 }
Index: ext/syck/emitter.c
===================================================================
--- ext/syck/emitter.c	(revision 18175)
+++ ext/syck/emitter.c	(revision 18176)
@@ -284,7 +284,7 @@
 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 );
Index: ext/syck/implicit.c
===================================================================
--- ext/syck/implicit.c	(revision 18175)
+++ ext/syck/implicit.c	(revision 18176)
@@ -47,7 +47,7 @@
 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;
 
@@ -1609,9 +1609,9 @@
 }
 
 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 );
@@ -1620,7 +1620,7 @@
 #line 1620 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy202;
 	++YYCURSOR;
 yy202:
Index: ext/syck/handler.c
===================================================================
--- ext/syck/handler.c	(revision 18175)
+++ ext/syck/handler.c	(revision 18176)
@@ -144,7 +144,7 @@
 }
 
 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';
Index: ext/syck/syck.h
===================================================================
--- ext/syck/syck.h	(revision 18175)
+++ ext/syck/syck.h	(revision 18176)
@@ -32,14 +32,11 @@
 #endif
 
 #if DEBUG
-  void syck_assert( char *, unsigned );
+void syck_assert( const char *, unsigned, const char * );
 # define ASSERT(f) \
-    if ( f ) \
-        {}   \
-    else     \
-        syck_assert( __FILE__, __LINE__ )
+    (( f ) ? (void)0 syck_assert( __FILE__, __LINE__, #f )
 #else
-# define ASSERT(f)
+# define ASSERT(f) ((void)0)
 #endif
 
 #ifndef NULL
@@ -345,13 +342,13 @@
 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 );
 
Index: ext/syck/token.c
===================================================================
--- ext/syck/token.c	(revision 18175)
+++ ext/syck/token.c	(revision 18176)
@@ -1116,7 +1116,7 @@
 #line 1117 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy94;
 	++YYCURSOR;
 yy94:
Index: ruby_1_8/ext/syck/bytecode.c
===================================================================
--- ruby_1_8/ext/syck/bytecode.c	(revision 18175)
+++ ruby_1_8/ext/syck/bytecode.c	(revision 18176)
@@ -165,7 +165,7 @@
 #line 165 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy0;
 	++YYCURSOR;
 yy0:
@@ -543,7 +543,7 @@
 #line 543 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy45;
 	++YYCURSOR;
 yy45:
Index: ruby_1_8/ext/syck/rubyext.c
===================================================================
--- ruby_1_8/ext/syck/rubyext.c	(revision 18175)
+++ ruby_1_8/ext/syck/rubyext.c	(revision 18176)
@@ -104,7 +104,7 @@
     int taint;
     char *ret;
     VALUE bc;
-    bytestring_t *sav;
+    bytestring_t *sav = NULL;
     void *data;
 
     SyckParser *parser = syck_new_parser();
@@ -2146,9 +2146,7 @@
     VALUE self;
 {
     VALUE type_id, str, style, scalar;
-    if (rb_scan_args(argc, argv, "21", &type_id, &str, &style) == 2) {
-        style = Qnil;
-    }
+    rb_scan_args(argc, argv, "21", &type_id, &str, &style);
     scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
     syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
     return scalar;
Index: ruby_1_8/ext/syck/syck.c
===================================================================
--- ruby_1_8/ext/syck/syck.c	(revision 18175)
+++ ruby_1_8/ext/syck/syck.c	(revision 18176)
@@ -19,11 +19,11 @@
  * 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",
-             file_name, line_num );
+    fprintf( stderr, "\nAssertion failed: %s, line %u: %s\n",
+             file_name, line_num, expr );
     fflush( stderr );
     abort();
 }
Index: ruby_1_8/ext/syck/emitter.c
===================================================================
--- ruby_1_8/ext/syck/emitter.c	(revision 18175)
+++ ruby_1_8/ext/syck/emitter.c	(revision 18176)
@@ -285,7 +285,7 @@
 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 );
Index: ruby_1_8/ext/syck/implicit.c
===================================================================
--- ruby_1_8/ext/syck/implicit.c	(revision 18175)
+++ ruby_1_8/ext/syck/implicit.c	(revision 18176)
@@ -48,7 +48,7 @@
 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 @@
 }
 
 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 @@
 #line 1620 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy202;
 	++YYCURSOR;
 yy202:
Index: ruby_1_8/ext/syck/handler.c
===================================================================
--- ruby_1_8/ext/syck/handler.c	(revision 18175)
+++ ruby_1_8/ext/syck/handler.c	(revision 18176)
@@ -145,7 +145,7 @@
 }
 
 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';
Index: ruby_1_8/ext/syck/syck.h
===================================================================
--- ruby_1_8/ext/syck/syck.h	(revision 18175)
+++ ruby_1_8/ext/syck/syck.h	(revision 18176)
@@ -33,14 +33,11 @@
 #endif
 
 #if DEBUG
-  void syck_assert( char *, unsigned );
+void syck_assert( const char *, unsigned, const char * );
 # define ASSERT(f) \
-    if ( f ) \
-        {}   \
-    else     \
-        syck_assert( __FILE__, __LINE__ )
+    (( f ) ? (void)0 syck_assert( __FILE__, __LINE__, #f )
 #else
-# define ASSERT(f)
+# define ASSERT(f) ((void)0)
 #endif
 
 #ifndef NULL
@@ -346,13 +343,13 @@
 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 );
 
Index: ruby_1_8/ext/syck/token.c
===================================================================
--- ruby_1_8/ext/syck/token.c	(revision 18175)
+++ ruby_1_8/ext/syck/token.c	(revision 18176)
@@ -1117,7 +1117,7 @@
 #line 1117 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
+	unsigned int yyaccept = 0;
 	goto yy94;
 	++YYCURSOR;
 yy94:
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18175)
+++ ruby_1_8/ChangeLog	(revision 18176)
@@ -1,3 +1,7 @@
+Wed Jul 23 06:11:58 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/syck: suppress warnings more.
+
 Wed Jul 23 04:18:41 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/syck: suppress warnings.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]