git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-11-04 07:19:23 +00:00
Родитель ab682d95e0
Коммит 413f24d3b0
14 изменённых файлов: 34 добавлений и 34 удалений

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

@ -4334,7 +4334,7 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
VpAsgn(c, a, VpGetSign(b));
VpSetZero(r,VpGetSign(a));
goto Exit;
}
}
word_a = a->Prec;
word_b = b->Prec;

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

@ -137,7 +137,7 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
FilePathValue(file);
/*
/*
* Note:
* The dbm compatibility layer of gdbm 1.9 doesn't respect O_CLOEXEC.
*/

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

@ -611,13 +611,13 @@ etc_systmpdir(void)
* the logged in user than environment variables such as $USER. For example:
*
* require 'etc'
*
*
* login = Etc.getlogin
* info = Etc.getpwnam(login)
* username = info.gecos.split(/,/).first
* puts "Hello #{username}, I see your login name is #{login}"
*
* Note that the methods provided by this module are not always secure.
* Note that the methods provided by this module are not always secure.
* It should be used for informational purposes, and not for security.
*/
void

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

@ -869,7 +869,7 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
rb_ary_push(ary, value);
if (length > 0)
length -= inner_read;
if (infinite &&
NUM2INT(ossl_asn1_get_tag(value)) == V_ASN1_EOC &&
SYM2ID(ossl_asn1_get_tag_class(value)) == sUNIVERSAL) {

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

@ -409,7 +409,7 @@ Init_ossl_digest()
* data1 = File.read('file1')
* sha256 = OpenSSL::Digest::SHA256.new
* digest1 = sha256.digest(data1)
*
*
* data2 = File.read('file2')
* sha256.reset
* digest2 = sha256.digest(data2)

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

@ -82,10 +82,10 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
#if HAVE_ENGINE_LOAD_NURON
OSSL_ENGINE_LOAD_IF_MATCH(nuron);
#endif
#if HAVE_ENGINE_LOAD_SUREWARE
#if HAVE_ENGINE_LOAD_SUREWARE
OSSL_ENGINE_LOAD_IF_MATCH(sureware);
#endif
#if HAVE_ENGINE_LOAD_UBSEC
#if HAVE_ENGINE_LOAD_UBSEC
OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
#endif
#if HAVE_ENGINE_LOAD_PADLOCK
@ -136,7 +136,7 @@ ossl_engine_s_engines(VALUE klass)
/* Need a ref count of two here because of ENGINE_free being
* called internally by OpenSSL when moving to the next ENGINE
* and by us when releasing the ENGINE reference */
ENGINE_up_ref(e);
ENGINE_up_ref(e);
WrapEngine(klass, obj, e);
rb_ary_push(ary, obj);
}

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

@ -45,7 +45,7 @@ struct ossl_generate_cb_arg {
int yield;
int stop;
int state;
};
};
int ossl_generate_cb_2(int p, int n, BN_GENCB *cb);
void ossl_generate_cb_stop(void *ptr);
#endif

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

@ -159,7 +159,7 @@ readline_getc(FILE *input)
}
}
}
#endif
#endif
c = rb_funcall(readline_instream, id_getbyte, 0, 0);
if (NIL_P(c)) return EOF;
return NUM2CHR(c);

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

@ -1385,7 +1385,7 @@ static void
discard_cmsg(struct cmsghdr *cmh, char *msg_end, int msg_peek_p)
{
# if !defined(FD_PASSING_WORK_WITH_RECVMSG_MSG_PEEK)
/*
/*
* FreeBSD 8.2.0, NetBSD 5 and MacOS X Snow Leopard doesn't
* allocate fds by recvmsg with MSG_PEEK.
* [ruby-dev:44189]

26
hash.c
Просмотреть файл

@ -3151,24 +3151,24 @@ env_update(VALUE env, VALUE hash)
* A Hash is a dictionary-like collection of unique keys and their values.
* Also called associative arrays, they are similar to Arrays, but where an
* Array uses integers as its index, a Hash allows you to use any object
* type.
* type.
*
* Hashes enumerate their values in the order that the corresponding keys
* were inserted.
* were inserted.
*
* A Hash can be easily created by using its implicit form:
*
* grades = { "Jane Doe" => 10, "Jim Doe" => 6 }
*
*
* Hashes allow an alternate syntax form when your keys are always symbols.
* Instead of
* Instead of
*
* options = { :font_size => 10, :font_family => "Arial" }
*
* You could write it as:
*
* You could write it as:
*
* options = { font_size: 10, font_family: "Arial" }
*
*
* Each named key is a symbol you can access in hash:
*
* options[:font_size] # => 10
@ -3180,7 +3180,7 @@ env_update(VALUE env, VALUE hash)
*
* Hashes have a <em>default value</em> that is returned when accessing
* keys that do not exist in the hash. If no default is set +nil+ is used.
* You can set the default value by sending it as an argument to Hash.new:
* You can set the default value by sending it as an argument to Hash.new:
*
* grades = Hash.new(0)
*
@ -3188,11 +3188,11 @@ env_update(VALUE env, VALUE hash)
*
* grades = {"Timmy Doe" => 8}
* grades.default = 0
*
*
* Accessing a value in a Hash requires using its key:
*
* puts grades["Jane Doe"] # => 10
*
*
* === Common Uses
*
* Hashes are an easy way to represent data structures, such as
@ -3200,12 +3200,12 @@ env_update(VALUE env, VALUE hash)
* books = {}
* books[:matz] = "The Ruby Language"
* books[:black] = "The Well-Grounded Rubyist"
*
*
* Hashes are also commonly used as a way to have named parameters in
* functions. Note that no brackets are used below. If a hash is the last
* argument on a method call, no braces are needed, thus creating a really
* clean interface:
*
* clean interface:
*
* Person.create(name: "John Doe", age: 27)
*
* def self.create(params)

2
io.c
Просмотреть файл

@ -5629,7 +5629,7 @@ rb_open_file(int argc, VALUE *argv, VALUE io)
* be passed the opened +file+ as an argument, and the File object will
* automatically be closed when the block terminates. In this instance,
* <code>File.open</code> returns the value of the block.
*
*
* See IO.new for a list of values for the +opt+ parameter.
*/

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

@ -5233,14 +5233,14 @@ rb_str_tr_bang(VALUE str, VALUE src, VALUE repl)
* call-seq:
* str.tr(from_str, to_str) => new_str
*
* Returns a copy of <i>str</i> with the characters in <i>from_str</i>
* replaced by the corresponding characters in <i>to_str</i>. If
* Returns a copy of <i>str</i> with the characters in <i>from_str</i>
* replaced by the corresponding characters in <i>to_str</i>. If
* <i>to_str</i> is shorter than <i>from_str</i>, it is padded with its last
* character in order to maintain the correspondence.
*
* "hello".tr('el', 'ip') #=> "hippo"
* "hello".tr('aeiou', '*') #=> "h*ll*"
*
*
* Both strings may use the c1-c2 notation to denote ranges of characters,
* and <i>from_str</i> may start with a <code>^</code>, which denotes all
* characters except those listed.

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

@ -1091,7 +1091,7 @@ consume_communication_pipe(void)
{
#define CCP_READ_BUFF_SIZE 1024
/* buffer can be shared because no one refers to them. */
static char buff[CCP_READ_BUFF_SIZE];
static char buff[CCP_READ_BUFF_SIZE];
ssize_t result;
retry:
@ -1150,11 +1150,11 @@ thread_timer(void *p)
timeout.tv_usec = TIME_QUANTUM_USEC;
/* polling (TIME_QUANTUM_USEC usec) */
result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, &timeout);
result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, &timeout);
}
else {
/* wait (infinite) */
result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, 0);
result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, 0);
}
if (result == 0) {

4
time.c
Просмотреть файл

@ -4882,7 +4882,7 @@ time_load(VALUE klass, VALUE str)
* t = Time.new(1993, 02, 24, 12, 0, 0, "+09:00")
*
* Was that a monday?
*
*
* t.monday? #=> false
*
* What year was that again?
@ -4905,7 +4905,7 @@ time_load(VALUE klass, VALUE str)
*
* t1 = Time.new(2010)
* t2 = Time.new(2011)
*
*
* t1 == t2 #=> false
* t1 == t1 #=> true
* t1 < t2 #=> true