зеркало из https://github.com/github/ruby.git
zlib.c: protoize
* ext/zlib/zlib.c (do_checksum): protoize the definition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
d85096ad45
Коммит
41bd073de2
|
@ -387,10 +387,7 @@ checksum_long(uLong (*func)(uLong, const Bytef*, uInt), uLong sum, const Bytef *
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static VALUE
|
static VALUE
|
||||||
do_checksum(argc, argv, func)
|
do_checksum(int argc, VALUE *argv, uLong (*func)(uLong, const Bytef*, uInt))
|
||||||
int argc;
|
|
||||||
VALUE *argv;
|
|
||||||
uLong (*func)(uLong, const Bytef*, uInt);
|
|
||||||
{
|
{
|
||||||
VALUE str, vsum;
|
VALUE str, vsum;
|
||||||
unsigned long sum;
|
unsigned long sum;
|
||||||
|
@ -1001,7 +998,8 @@ zstream_run_func(void *ptr)
|
||||||
if (args->stream_output) {
|
if (args->stream_output) {
|
||||||
state = (int)(VALUE)rb_thread_call_with_gvl(zstream_expand_buffer_protect,
|
state = (int)(VALUE)rb_thread_call_with_gvl(zstream_expand_buffer_protect,
|
||||||
(void *)z);
|
(void *)z);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
state = zstream_expand_buffer_without_gvl(z);
|
state = zstream_expand_buffer_without_gvl(z);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1983,7 +1981,8 @@ do_inflate(struct zstream *z, VALUE src)
|
||||||
* stream's required dictionary.
|
* stream's required dictionary.
|
||||||
*/
|
*/
|
||||||
static VALUE
|
static VALUE
|
||||||
rb_inflate_add_dictionary(VALUE obj, VALUE dictionary) {
|
rb_inflate_add_dictionary(VALUE obj, VALUE dictionary)
|
||||||
|
{
|
||||||
VALUE dictionaries = rb_ivar_get(obj, id_dictionaries);
|
VALUE dictionaries = rb_ivar_get(obj, id_dictionaries);
|
||||||
VALUE checksum = do_checksum(1, &dictionary, adler32);
|
VALUE checksum = do_checksum(1, &dictionary, adler32);
|
||||||
|
|
||||||
|
@ -4099,7 +4098,8 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
|
||||||
rsptr = "\n\n";
|
rsptr = "\n\n";
|
||||||
rslen = 2;
|
rslen = 2;
|
||||||
rspara = 1;
|
rspara = 1;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
rsptr = RSTRING_PTR(rs);
|
rsptr = RSTRING_PTR(rs);
|
||||||
rslen = RSTRING_LEN(rs);
|
rslen = RSTRING_LEN(rs);
|
||||||
rspara = 0;
|
rspara = 0;
|
||||||
|
@ -4136,7 +4136,8 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
|
||||||
n = filled;
|
n = filled;
|
||||||
if (limit > 0 && filled >= limit) break;
|
if (limit > 0 && filled >= limit) break;
|
||||||
n++;
|
n++;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
n += (long)(res - p);
|
n += (long)(res - p);
|
||||||
p = res;
|
p = res;
|
||||||
if (rslen == 1 || memcmp(p, rsptr, rslen) == 0) break;
|
if (rslen == 1 || memcmp(p, rsptr, rslen) == 0) break;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче