From cba32dcaa6cd7369d0c0d130a15522048440c658 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 15 Jul 2007 13:24:39 +0000 Subject: * ext/dl/cfunc.c (rb_dlcfunc_call): adjust format. [ruby-dev:31222] * 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] * include/ruby/win32.h (rb_w32_getcwd): prototype added. [ruby-dev:31232] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 29 +++++++++++++++++++++++++++++ ext/digest/digest.c | 9 ++++----- ext/dl/cfunc.c | 8 +++++++- ext/openssl/ossl.h | 1 + ext/openssl/ossl_pkcs5.h | 6 ++++++ ext/openssl/ossl_x509name.c | 4 ++-- ext/sdbm/_sdbm.c | 2 +- ext/syck/syck.h | 2 ++ include/ruby/win32.h | 1 + win32/win32.c | 1 + 10 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 ext/openssl/ossl_pkcs5.h diff --git a/ChangeLog b/ChangeLog index dcf203382c..15f935e40a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +Sun Jul 15 22:24:37 2007 pegacorn + + * ext/dl/cfunc.c (rb_dlcfunc_call): adjust format. [ruby-dev:31222] + + * 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] + + * include/ruby/win32.h (rb_w32_getcwd): prototype added. + [ruby-dev:31232] + Sun Jul 15 21:07:43 2007 Nobuyoshi Nakada * bignum.c (bigtrunc): do not empty Bignum. [ruby-dev:31229] diff --git a/ext/digest/digest.c b/ext/digest/digest.c index 92a925c616..0b910e8c47 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -97,7 +97,7 @@ rb_digest_s_hexencode(VALUE klass, VALUE str) 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 @@ rb_digest_instance_update(VALUE self, VALUE str) 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 @@ rb_digest_instance_finish(VALUE self) 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 @@ rb_digest_instance_length(VALUE self) 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 @@ static VALUE rb_digest_class_s_digest(int argc, VALUE *argv, VALUE klass) { VALUE str; - void *pctx; volatile VALUE obj; if (argc < 1) { diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c index 253c78f2b1..22e8600002 100644 --- a/ext/dl/cfunc.c +++ b/ext/dl/cfunc.c @@ -460,7 +460,13 @@ rb_dlcfunc_call(VALUE self, VALUE ary) } } else{ - rb_raise(rb_eDLError, "unsupported call type: %x", cfunc->calltype); + rb_raise(rb_eDLError, +#ifndef LONG_LONG_VALUE + "unsupported call type: %lx", +#else + "unsupported call type: %llx", +#endif + cfunc->calltype); } rb_dl_set_last_error(self, INT2NUM(errno)); diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index b11614560e..a4bc661eb1 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -203,6 +203,7 @@ void ossl_debug(const char *, ...); #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" diff --git a/ext/openssl/ossl_pkcs5.h b/ext/openssl/ossl_pkcs5.h new file mode 100644 index 0000000000..a3b132bc50 --- /dev/null +++ b/ext/openssl/ossl_pkcs5.h @@ -0,0 +1,6 @@ +#if !defined(_OSSL_PKCS5_H_) +#define _OSSL_PKCS5_H_ + +void Init_ossl_pkcs5(void); + +#endif /* _OSSL_PKCS5_H_ */ diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index c1164644e4..b4434d2a34 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -204,11 +204,11 @@ ossl_x509name_to_s(int argc, VALUE *argv, VALUE self) 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); diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index 7fdeb0dbd0..1d81778193 100644 --- a/ext/sdbm/_sdbm.c +++ b/ext/sdbm/_sdbm.c @@ -71,7 +71,7 @@ static int duppair proto((char *, datum)); #include #include -#ifdef MSDOS +#ifdef DOSISH #include #endif #include diff --git a/ext/syck/syck.h b/ext/syck/syck.h index 0fdff8e380..f5b0cc497e 100644 --- a/ext/syck/syck.h +++ b/ext/syck/syck.h @@ -17,6 +17,7 @@ #define YAML_DOMAIN "yaml.org,2002" #include +#include #include #include "ruby/st.h" @@ -399,6 +400,7 @@ int syck_scan_scalar( int, char *, long ); 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 ); diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 4644a4ae71..4ef337d18d 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -237,6 +237,7 @@ extern struct protoent *WSAAPI rb_w32_getprotobynumber(int); extern struct servent *WSAAPI rb_w32_getservbyname(const char *, const char *); extern struct servent *WSAAPI rb_w32_getservbyport(int, const char *); extern int rb_w32_socketpair(int, int, int, int *); +extern char * rb_w32_getcwd(char *, int); extern char * rb_w32_getenv(const char *); extern int rb_w32_rename(const char *, const char *); extern char **rb_w32_get_environ(void); diff --git a/win32/win32.c b/win32/win32.c index 36d303abc9..90aac79508 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef __MINGW32__ #include #endif -- cgit v1.2.3