ruby-changes:1686
From: ko1@a...
Date: 22 Aug 2007 10:16:40 +0900
Subject: [ruby-changes:1686] shyouhei - Ruby:r13176 (ruby_1_8_6): * ext/digest/digest.c (rb_digest_instance_update,
shyouhei 2007-08-22 10:16:17 +0900 (Wed, 22 Aug 2007)
New Revision: 13176
Added files:
branches/ruby_1_8_6/ext/openssl/ossl_pkcs5.h
Modified files:
branches/ruby_1_8_6/ChangeLog
branches/ruby_1_8_6/ext/digest/digest.c
branches/ruby_1_8_6/ext/openssl/ossl.h
branches/ruby_1_8_6/ext/openssl/ossl_x509name.c
branches/ruby_1_8_6/ext/sdbm/_sdbm.c
branches/ruby_1_8_6/ext/syck/syck.h
branches/ruby_1_8_6/version.h
branches/ruby_1_8_6/win32/win32.c
branches/ruby_1_8_6/win32/win32.h
Log:
* ext/digest/digest.c (rb_digest_instance_update,
rb_digest_instance_finish, rb_digest_instance_reset,
rb_digest_instance_block_length): %s in rb_raise() expects char*.
[ruby-dev:31222]
* ext/openssl/ossl.h: include ossl_pkcs5.h. [ruby-dev:31231]
* ext/openssl/ossl_pkcs5.h: new file for PKCS5. [ruby-dev:31231]
* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
instead of rb_raise(). [ruby-dev:31222]
* ext/sdbm/_sdbm.c: DOSISH platforms need io.h. [ruby-dev:31232]
* ext/syck/syck.h: include stdlib.h for malloc() and free().
[ruby-dev:31232]
* ext/syck/syck.h (syck_parser_set_input_type): prototype added.
[ruby-dev:31231]
* win32/win32.c: include mbstring.h for _mbspbrk(). [ruby-dev:31232]
* win32.h (rb_w32_getcwd): prototype added. [ruby-dev:31232]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/syck/syck.h?r1=13176&r2=13175
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=13176&r2=13175
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=13176&r2=13175
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/win32/win32.h?r1=13176&r2=13175
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/sdbm/_sdbm.c?r1=13176&r2=13175
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/digest/digest.c?r1=13176&r2=13175
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/openssl/ossl_x509name.c?r1=13176&r2=13175
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/openssl/ossl_pkcs5.h
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/win32/win32.c?r1=13176&r2=13175
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/openssl/ossl.h?r1=13176&r2=13175
Index: ruby_1_8_6/ext/digest/digest.c
===================================================================
--- ruby_1_8_6/ext/digest/digest.c (revision 13175)
+++ ruby_1_8_6/ext/digest/digest.c (revision 13176)
@@ -97,7 +97,7 @@
static VALUE
rb_digest_instance_update(VALUE self, VALUE str)
{
- rb_raise(rb_eRuntimeError, "%s does not implement update()", rb_inspect(self));
+ rb_raise(rb_eRuntimeError, "%s does not implement update()", RSTRING_PTR(rb_inspect(self)));
}
/*
@@ -115,7 +115,7 @@
static VALUE
rb_digest_instance_finish(VALUE self)
{
- rb_raise(rb_eRuntimeError, "%s does not implement finish()", rb_inspect(self));
+ rb_raise(rb_eRuntimeError, "%s does not implement finish()", RSTRING_PTR(rb_inspect(self)));
}
/*
@@ -129,7 +129,7 @@
static VALUE
rb_digest_instance_reset(VALUE self)
{
- rb_raise(rb_eRuntimeError, "%s does not implement reset()", rb_inspect(self));
+ rb_raise(rb_eRuntimeError, "%s does not implement reset()", RSTRING_PTR(rb_inspect(self)));
}
/*
@@ -358,7 +358,7 @@
static VALUE
rb_digest_instance_block_length(VALUE self)
{
- rb_raise(rb_eRuntimeError, "%s does not implement block_length()", rb_inspect(self));
+ rb_raise(rb_eRuntimeError, "%s does not implement block_length()", RSTRING_PTR(rb_inspect(self)));
}
/*
@@ -381,7 +381,6 @@
rb_digest_class_s_digest(int argc, VALUE *argv, VALUE klass)
{
VALUE str;
- void *pctx;
volatile VALUE obj;
if (argc < 1) {
Index: ruby_1_8_6/ext/sdbm/_sdbm.c
===================================================================
--- ruby_1_8_6/ext/sdbm/_sdbm.c (revision 13175)
+++ ruby_1_8_6/ext/sdbm/_sdbm.c (revision 13176)
@@ -71,7 +71,7 @@
#include <stdio.h>
#include <stdlib.h>
-#ifdef MSDOS
+#ifdef DOSISH
#include <io.h>
#endif
#include <sys/types.h>
Index: ruby_1_8_6/ext/openssl/ossl.h
===================================================================
--- ruby_1_8_6/ext/openssl/ossl.h (revision 13175)
+++ ruby_1_8_6/ext/openssl/ossl.h (revision 13176)
@@ -202,6 +202,7 @@
#include "ossl_ocsp.h"
#include "ossl_pkcs12.h"
#include "ossl_pkcs7.h"
+#include "ossl_pkcs5.h"
#include "ossl_pkey.h"
#include "ossl_rand.h"
#include "ossl_ssl.h"
Index: ruby_1_8_6/ext/openssl/ossl_x509name.c
===================================================================
--- ruby_1_8_6/ext/openssl/ossl_x509name.c (revision 13175)
+++ ruby_1_8_6/ext/openssl/ossl_x509name.c (revision 13176)
@@ -188,11 +188,11 @@
return ossl_x509name_to_s_old(self);
else iflag = NUM2ULONG(flag);
if (!(out = BIO_new(BIO_s_mem())))
- rb_raise(eX509NameError, NULL);
+ ossl_raise(eX509NameError, NULL);
GetX509Name(self, name);
if (!X509_NAME_print_ex(out, name, 0, iflag)){
BIO_free(out);
- rb_raise(eX509NameError, NULL);
+ ossl_raise(eX509NameError, NULL);
}
str = ossl_membio2str(out);
Index: ruby_1_8_6/ext/openssl/ossl_pkcs5.h
===================================================================
--- ruby_1_8_6/ext/openssl/ossl_pkcs5.h (revision 0)
+++ ruby_1_8_6/ext/openssl/ossl_pkcs5.h (revision 13176)
@@ -0,0 +1,6 @@
+#if !defined(_OSSL_PKCS5_H_)
+#define _OSSL_PKCS5_H_
+
+void Init_ossl_pkcs5(void);
+
+#endif /* _OSSL_PKCS5_H_ */
Index: ruby_1_8_6/ext/syck/syck.h
===================================================================
--- ruby_1_8_6/ext/syck/syck.h (revision 13175)
+++ ruby_1_8_6/ext/syck/syck.h (revision 13176)
@@ -17,6 +17,7 @@
#define YAML_DOMAIN "yaml.org,2002"
#include <stdio.h>
+#include <stdlib.h>
#include <ctype.h>
#include "st.h"
@@ -399,6 +400,7 @@
void syck_parser_handler( SyckParser *, SyckNodeHandler );
void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
+void syck_parser_set_input_type( SyckParser *, enum syck_parser_input );
void syck_parser_file( SyckParser *, FILE *, SyckIoFileRead );
void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead );
void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead );
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog (revision 13175)
+++ ruby_1_8_6/ChangeLog (revision 13176)
@@ -1,3 +1,29 @@
+Wed Aug 22 10:13:45 2007 pegacorn <subscriber.jp AT gmail.com>
+
+ * ext/digest/digest.c (rb_digest_instance_update,
+ rb_digest_instance_finish, rb_digest_instance_reset,
+ rb_digest_instance_block_length): %s in rb_raise() expects char*.
+ [ruby-dev:31222]
+
+ * ext/openssl/ossl.h: include ossl_pkcs5.h. [ruby-dev:31231]
+
+ * ext/openssl/ossl_pkcs5.h: new file for PKCS5. [ruby-dev:31231]
+
+ * ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
+ instead of rb_raise(). [ruby-dev:31222]
+
+ * ext/sdbm/_sdbm.c: DOSISH platforms need io.h. [ruby-dev:31232]
+
+ * ext/syck/syck.h: include stdlib.h for malloc() and free().
+ [ruby-dev:31232]
+
+ * ext/syck/syck.h (syck_parser_set_input_type): prototype added.
+ [ruby-dev:31231]
+
+ * win32/win32.c: include mbstring.h for _mbspbrk(). [ruby-dev:31232]
+
+ * win32.h (rb_w32_getcwd): prototype added. [ruby-dev:31232]
+
Wed Aug 22 10:11:59 2007 Nobuyoshi Nakada <nobu@r...>
* bignum.c (rb_cstr_to_inum): check leading non-digits.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h (revision 13175)
+++ ruby_1_8_6/version.h (revision 13176)
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-22"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 64
+#define RUBY_PATCHLEVEL 65
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/win32/win32.c
===================================================================
--- ruby_1_8_6/win32/win32.c (revision 13175)
+++ ruby_1_8_6/win32/win32.c (revision 13176)
@@ -27,6 +27,7 @@
#include <wincon.h>
#ifdef __MINGW32__
#include <mswsock.h>
+#include <mbstring.h>
#endif
#include "win32.h"
#include "win32/dir.h"
Index: ruby_1_8_6/win32/win32.h
===================================================================
--- ruby_1_8_6/win32/win32.h (revision 13175)
+++ ruby_1_8_6/win32/win32.h (revision 13176)
@@ -193,6 +193,7 @@
extern struct protoent * rb_w32_getprotobynumber(int);
extern struct servent * rb_w32_getservbyname(char *, char *);
extern struct servent * rb_w32_getservbyport(int, char *);
+extern char * rb_w32_getcwd(char *, int);
extern char * rb_w32_getenv(const char *);
extern int rb_w32_rename(const char *, const char *);
extern int rb_w32_stat(const char *, struct stat *);
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml