github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

* 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
This commit is contained in:
nobu 2007-07-15 13:24:39 +00:00
Родитель 746a7ec4f6
Коммит cba32dcaa6
10 изменённых файлов: 54 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

29
ChangeLog
Просмотреть файл

@ -1,3 +1,32 @@
Sun Jul 15 22:24:37 2007 pegacorn <subscriber.jp AT gmail.com>
* 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 <nobu@ruby-lang.org>
* bignum.c (bigtrunc): do not empty Bignum. [ruby-dev:31229]

9
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) {

8
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));

1
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"

6
ext/openssl/ossl_pkcs5.h Normal file
Просмотреть файл

@ -0,0 +1,6 @@
#if !defined(_OSSL_PKCS5_H_)
#define _OSSL_PKCS5_H_
void Init_ossl_pkcs5(void);
#endif /* _OSSL_PKCS5_H_ */

4
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);

2
ext/sdbm/_sdbm.c
Просмотреть файл

@ -71,7 +71,7 @@ static int duppair proto((char *, datum));
#include <stdio.h>
#include <stdlib.h>
#ifdef MSDOS
#ifdef DOSISH
#include <io.h>
#endif
#include <sys/types.h>

2
ext/syck/syck.h
Просмотреть файл

@ -17,6 +17,7 @@
#define YAML_DOMAIN "yaml.org,2002"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#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 );

1
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);

1
win32/win32.c
Просмотреть файл

@ -27,6 +27,7 @@
#include <wincon.h>
#include <share.h>
#include <shlobj.h>
#include <mbstring.h>
#ifdef __MINGW32__
#include <mswsock.h>
#endif