admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce compiler warnings from mruby-io gem.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-12-08 10:07:41 +09:00
parent f9d1d72217
commit 83065df67a
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-io/src/file.c
+2 -2
View File
@@ -208,7 +208,7 @@ static mrb_value
mrb_file_realpath(mrb_state *mrb, mrb_value klass)
{
mrb_value pathname, dir_string, s, result;
int argc;
mrb_int argc;
char *cpath;
argc = mrb_get_args(mrb, "S|S", &pathname, &dir_string);
@@ -250,7 +250,7 @@ mrb_file__gethome(mrb_state *mrb, mrb_value klass)
{
#ifndef _WIN32
mrb_value username;
int argc;
mrb_int argc;
char *home;
argc = mrb_get_args(mrb, "|S", &username);
mrbgems/mruby-io/src/io.c
+10 -9
View File
@@ -28,6 +28,7 @@
#define read _read
#define write _write
#define lseek _lseek
#define isatty _isatty
#else
#include <sys/wait.h>
#include <unistd.h>
@@ -545,7 +546,7 @@ mrb_io_s_sysclose(mrb_state *mrb, mrb_value klass)
{
mrb_int fd;
mrb_get_args(mrb, "i", &fd);
if (close(fd) == -1) {
if (close((int)fd) == -1) {
mrb_sys_fail(mrb, "close");
}
return mrb_fixnum_value(0);
@@ -564,7 +565,7 @@ mrb_cloexec_open(mrb_state *mrb, const char *pathname, mrb_int flags, mrb_int mo
flags |= O_NOINHERIT;
#endif
reopen:
fd = open(pathname, flags, mode);
fd = open(pathname, (int)flags, mode);
if (fd == -1) {
if (!retry) {
switch (errno) {
@@ -592,9 +593,9 @@ mrb_io_s_sysopen(mrb_state *mrb, mrb_value klass)
{
mrb_value path = mrb_nil_value();
mrb_value mode = mrb_nil_value();
mrb_int fd, flags, perm = -1;
mrb_int fd, perm = -1;
const char *pat;
int modenum;
int flags, modenum;
mrb_get_args(mrb, "S|Si", &path, &mode, &perm);
if (mrb_nil_p(mode)) {
@@ -641,7 +642,7 @@ mrb_io_sysread(mrb_state *mrb, mrb_value io)
if (!fptr->readable) {
mrb_raise(mrb, E_IO_ERROR, "not opened for reading");
}
ret = read(fptr->fd, RSTRING_PTR(buf), maxlen);
ret = read(fptr->fd, RSTRING_PTR(buf), (size_t)maxlen);
switch (ret) {
case 0: /* EOF */
if (maxlen == 0) {
@@ -676,7 +677,7 @@ mrb_io_sysseek(mrb_state *mrb, mrb_value io)
}
fptr = (struct mrb_io *)mrb_get_datatype(mrb, io, &mrb_io_type);
pos = lseek(fptr->fd, offset, whence);
pos = lseek(fptr->fd, offset, (int)whence);
if (pos == -1) {
mrb_sys_fail(mrb, "sysseek");
}
@@ -711,7 +712,7 @@ mrb_io_syswrite(mrb_state *mrb, mrb_value io)
} else {
fd = fptr->fd2;
}
length = write(fd, RSTRING_PTR(buf), RSTRING_LEN(buf));
length = write(fd, RSTRING_PTR(buf), (size_t)RSTRING_LEN(buf));
if (length == -1) {
mrb_sys_fail(mrb, 0);
}
@@ -760,12 +761,12 @@ time2timeval(mrb_state *mrb, mrb_value time)
switch (mrb_type(time)) {
case MRB_TT_FIXNUM:
t.tv_sec = mrb_fixnum(time);
t.tv_sec = (time_t)mrb_fixnum(time);
t.tv_usec = 0;
break;
case MRB_TT_FLOAT:
t.tv_sec = mrb_float(time);
t.tv_sec = (time_t)mrb_float(time);
t.tv_usec = (mrb_float(time) - t.tv_sec) * 1000000.0;
break;