git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-09-27 05:08:53 +00:00
Родитель 65d7479920
Коммит 253fd5fe6b
6 изменённых файлов: 59 добавлений и 59 удалений

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

@ -191,24 +191,24 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
} }
if (dbm) { if (dbm) {
/* /*
* History of dbm_pagfno() and dbm_dirfno() in ndbm and its compatibles. * History of dbm_pagfno() and dbm_dirfno() in ndbm and its compatibles.
* (dbm_pagfno() and dbm_dirfno() is not standardized.) * (dbm_pagfno() and dbm_dirfno() is not standardized.)
* *
* 1986: 4.3BSD provides ndbm. * 1986: 4.3BSD provides ndbm.
* It provides dbm_pagfno() and dbm_dirfno() as macros. * It provides dbm_pagfno() and dbm_dirfno() as macros.
* 1991: gdbm-1.5 provides them as functions. * 1991: gdbm-1.5 provides them as functions.
* They returns a same descriptor. * They returns a same descriptor.
* (Earlier releases may have the functions too.) * (Earlier releases may have the functions too.)
* 1991: Net/2 provides Berkeley DB. * 1991: Net/2 provides Berkeley DB.
* It doesn't provide dbm_pagfno() and dbm_dirfno(). * It doesn't provide dbm_pagfno() and dbm_dirfno().
* 1992: 4.4BSD Alpha provides Berkeley DB with dbm_dirfno() as a function. * 1992: 4.4BSD Alpha provides Berkeley DB with dbm_dirfno() as a function.
* dbm_pagfno() is a macro as DBM_PAGFNO_NOT_AVAILABLE. * dbm_pagfno() is a macro as DBM_PAGFNO_NOT_AVAILABLE.
* 1997: Berkeley DB 2.0 is released by Sleepycat Software, Inc. * 1997: Berkeley DB 2.0 is released by Sleepycat Software, Inc.
* It defines dbm_pagfno() and dbm_dirfno() as macros. * It defines dbm_pagfno() and dbm_dirfno() as macros.
* 2011: gdbm-1.9 creates a separate dir file. * 2011: gdbm-1.9 creates a separate dir file.
* dbm_pagfno() and dbm_dirfno() returns different descriptors. * dbm_pagfno() and dbm_dirfno() returns different descriptors.
*/ */
#if defined(HAVE_DBM_PAGFNO) #if defined(HAVE_DBM_PAGFNO)
rb_fd_fix_cloexec(dbm_pagfno(dbm)); rb_fd_fix_cloexec(dbm_pagfno(dbm));
#endif #endif
@ -217,8 +217,8 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
#endif #endif
#if defined(RUBYDBM_DB_HEADER) && defined(HAVE_TYPE_DBC) #if defined(RUBYDBM_DB_HEADER) && defined(HAVE_TYPE_DBC)
/* Disable Berkeley DB error messages such as: /* Disable Berkeley DB error messages such as:
* DB->put: attempt to modify a read-only database */ * DB->put: attempt to modify a read-only database */
((DBC*)dbm)->dbp->set_errfile(((DBC*)dbm)->dbp, NULL); ((DBC*)dbm)->dbp->set_errfile(((DBC*)dbm)->dbp, NULL);
#endif #endif
} }

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

@ -1012,7 +1012,7 @@ etc_nprocessors(VALUE obj)
ncpus = etc_nprocessors_affin(); ncpus = etc_nprocessors_affin();
if (ncpus != -1) { if (ncpus != -1) {
return INT2NUM(ncpus); return INT2NUM(ncpus);
} }
/* fallback to _SC_NPROCESSORS_ONLN */ /* fallback to _SC_NPROCESSORS_ONLN */
#endif #endif

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

@ -176,24 +176,24 @@ sdbm_open(register char *file, register int flags, register int mode)
static int static int
fd_set_cloexec(int fd) fd_set_cloexec(int fd)
{ {
/* MinGW don't have F_GETFD and FD_CLOEXEC. [ruby-core:40281] */ /* MinGW don't have F_GETFD and FD_CLOEXEC. [ruby-core:40281] */
#ifdef F_GETFD #ifdef F_GETFD
int flags, ret; int flags, ret;
flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */ flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
if (flags == -1) { if (flags == -1) {
return -1; return -1;
} }
if (2 < fd) { if (2 < fd) {
if (!(flags & FD_CLOEXEC)) { if (!(flags & FD_CLOEXEC)) {
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
ret = fcntl(fd, F_SETFD, flags); ret = fcntl(fd, F_SETFD, flags);
if (ret == -1) { if (ret == -1) {
return -1; return -1;
} }
} }
} }
#endif #endif
return 0; return 0;
} }
DBM * DBM *
@ -400,20 +400,20 @@ makroom(register DBM *db, long int hash, int need)
*/ */
#if defined _WIN32 #if defined _WIN32
/* /*
* Fill hole with 0 if made it. * Fill hole with 0 if made it.
* (hole is NOT read as 0) * (hole is NOT read as 0)
*/ */
oldtail = lseek(db->pagf, 0L, SEEK_END); oldtail = lseek(db->pagf, 0L, SEEK_END);
memset(zer, 0, PBLKSIZ); memset(zer, 0, PBLKSIZ);
while (OFF_PAG(newp) > oldtail) { while (OFF_PAG(newp) > oldtail) {
if (lseek(db->pagf, 0L, SEEK_END) < 0 || if (lseek(db->pagf, 0L, SEEK_END) < 0 ||
write(db->pagf, zer, PBLKSIZ) < 0) { write(db->pagf, zer, PBLKSIZ) < 0) {
return 0; return 0;
}
oldtail += PBLKSIZ;
} }
oldtail += PBLKSIZ;
}
#endif #endif
if (hash & (db->hmask + 1)) { if (hash & (db->hmask + 1)) {

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

@ -1558,7 +1558,7 @@ strio_external_encoding(VALUE self)
static VALUE static VALUE
strio_internal_encoding(VALUE self) strio_internal_encoding(VALUE self)
{ {
return Qnil; return Qnil;
} }
/* /*

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

@ -504,7 +504,7 @@ void Init_syslog(void)
rb_define_syslog_facility(LOG_NEWS); rb_define_syslog_facility(LOG_NEWS);
#endif #endif
#ifdef LOG_NTP #ifdef LOG_NTP
rb_define_syslog_facility(LOG_NTP); rb_define_syslog_facility(LOG_NTP);
#endif #endif
#ifdef LOG_SECURITY #ifdef LOG_SECURITY
rb_define_syslog_facility(LOG_SECURITY); rb_define_syslog_facility(LOG_SECURITY);

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

@ -451,7 +451,7 @@ rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
static VALUE static VALUE
rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2) rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2)
{ {
return ULONG2NUM( return ULONG2NUM(
adler32_combine(NUM2ULONG(adler1), NUM2ULONG(adler2), NUM2LONG(len2))); adler32_combine(NUM2ULONG(adler1), NUM2ULONG(adler2), NUM2LONG(len2)));
} }
#else #else
@ -489,7 +489,7 @@ rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
static VALUE static VALUE
rb_zlib_crc32_combine(VALUE klass, VALUE crc1, VALUE crc2, VALUE len2) rb_zlib_crc32_combine(VALUE klass, VALUE crc1, VALUE crc2, VALUE len2)
{ {
return ULONG2NUM( return ULONG2NUM(
crc32_combine(NUM2ULONG(crc1), NUM2ULONG(crc2), NUM2LONG(len2))); crc32_combine(NUM2ULONG(crc1), NUM2ULONG(crc2), NUM2LONG(len2)));
} }
#else #else
@ -644,7 +644,7 @@ zstream_expand_buffer(struct zstream *z)
} }
else { else {
zstream_expand_buffer_into(z, zstream_expand_buffer_into(z,
ZSTREAM_AVAIL_OUT_STEP_MAX - buf_filled); ZSTREAM_AVAIL_OUT_STEP_MAX - buf_filled);
} }
} }
else { else {
@ -1381,7 +1381,7 @@ rb_zstream_data_type(VALUE obj)
static VALUE static VALUE
rb_zstream_adler(VALUE obj) rb_zstream_adler(VALUE obj)
{ {
return rb_uint2inum(get_zstream(obj)->stream.adler); return rb_uint2inum(get_zstream(obj)->stream.adler);
} }
/* /*
@ -2673,7 +2673,7 @@ gzfile_calc_crc(struct gzfile *gz, VALUE str)
} }
else { else {
gz->crc = checksum_long(crc32, gz->crc, (Bytef*)RSTRING_PTR(str) + gz->ungetc, gz->crc = checksum_long(crc32, gz->crc, (Bytef*)RSTRING_PTR(str) + gz->ungetc,
RSTRING_LEN(str) - gz->ungetc); RSTRING_LEN(str) - gz->ungetc);
gz->ungetc = 0; gz->ungetc = 0;
} }
} }
@ -4370,9 +4370,9 @@ zlib_gunzip(VALUE klass, VALUE src)
gzfile_read_header(gz); gzfile_read_header(gz);
dst = zstream_detach_buffer(&gz->z); dst = zstream_detach_buffer(&gz->z);
gzfile_calc_crc(gz, dst); gzfile_calc_crc(gz, dst);
if (!ZSTREAM_IS_FINISHED(&gz->z)) { if (!ZSTREAM_IS_FINISHED(&gz->z)) {
rb_raise(cGzError, "unexpected end of file"); rb_raise(cGzError, "unexpected end of file");
} }
if (NIL_P(gz->z.input)) if (NIL_P(gz->z.input))
rb_raise(cNoFooter, "footer is not found"); rb_raise(cNoFooter, "footer is not found");
gzfile_check_footer(gz); gzfile_check_footer(gz);