Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
a5b8603a
Commit
a5b8603a
authored
Dec 12, 2017
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Winsock uses `int` where UNIX uses `size_t`.
parent
a9e434e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
mrbgems/mruby-socket/src/socket.c
mrbgems/mruby-socket/src/socket.c
+8
-6
No files found.
mrbgems/mruby-socket/src/socket.c
View file @
a5b8603a
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
#ifndef _SSIZE_T_DEFINED
#ifndef _SSIZE_T_DEFINED
typedef
int
ssize_t
;
typedef
int
ssize_t
;
#endif
#endif
typedef
int
fsize_t
;
#else
#else
#include <sys/types.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/socket.h>
...
@@ -25,6 +26,7 @@
...
@@ -25,6 +26,7 @@
#include <fcntl.h>
#include <fcntl.h>
#include <netdb.h>
#include <netdb.h>
#include <unistd.h>
#include <unistd.h>
typedef
size_t
fsize_t
;
#endif
#endif
#include <stddef.h>
#include <stddef.h>
...
@@ -339,7 +341,7 @@ mrb_basicsocket_recv(mrb_state *mrb, mrb_value self)
...
@@ -339,7 +341,7 @@ mrb_basicsocket_recv(mrb_state *mrb, mrb_value self)
mrb_get_args
(
mrb
,
"i|i"
,
&
maxlen
,
&
flags
);
mrb_get_args
(
mrb
,
"i|i"
,
&
maxlen
,
&
flags
);
buf
=
mrb_str_buf_new
(
mrb
,
maxlen
);
buf
=
mrb_str_buf_new
(
mrb
,
maxlen
);
n
=
recv
(
socket_fd
(
mrb
,
self
),
RSTRING_PTR
(
buf
),
(
size_t
)
maxlen
,
(
int
)
flags
);
n
=
recv
(
socket_fd
(
mrb
,
self
),
RSTRING_PTR
(
buf
),
(
f
size_t
)
maxlen
,
(
int
)
flags
);
if
(
n
==
-
1
)
if
(
n
==
-
1
)
mrb_sys_fail
(
mrb
,
"recv"
);
mrb_sys_fail
(
mrb
,
"recv"
);
mrb_str_resize
(
mrb
,
buf
,
(
mrb_int
)
n
);
mrb_str_resize
(
mrb
,
buf
,
(
mrb_int
)
n
);
...
@@ -358,7 +360,7 @@ mrb_basicsocket_recvfrom(mrb_state *mrb, mrb_value self)
...
@@ -358,7 +360,7 @@ mrb_basicsocket_recvfrom(mrb_state *mrb, mrb_value self)
buf
=
mrb_str_buf_new
(
mrb
,
maxlen
);
buf
=
mrb_str_buf_new
(
mrb
,
maxlen
);
socklen
=
sizeof
(
struct
sockaddr_storage
);
socklen
=
sizeof
(
struct
sockaddr_storage
);
sa
=
mrb_str_buf_new
(
mrb
,
socklen
);
sa
=
mrb_str_buf_new
(
mrb
,
socklen
);
n
=
recvfrom
(
socket_fd
(
mrb
,
self
),
RSTRING_PTR
(
buf
),
(
size_t
)
maxlen
,
(
int
)
flags
,
(
struct
sockaddr
*
)
RSTRING_PTR
(
sa
),
&
socklen
);
n
=
recvfrom
(
socket_fd
(
mrb
,
self
),
RSTRING_PTR
(
buf
),
(
f
size_t
)
maxlen
,
(
int
)
flags
,
(
struct
sockaddr
*
)
RSTRING_PTR
(
sa
),
&
socklen
);
if
(
n
==
-
1
)
if
(
n
==
-
1
)
mrb_sys_fail
(
mrb
,
"recvfrom"
);
mrb_sys_fail
(
mrb
,
"recvfrom"
);
mrb_str_resize
(
mrb
,
buf
,
(
mrb_int
)
n
);
mrb_str_resize
(
mrb
,
buf
,
(
mrb_int
)
n
);
...
@@ -379,9 +381,9 @@ mrb_basicsocket_send(mrb_state *mrb, mrb_value self)
...
@@ -379,9 +381,9 @@ mrb_basicsocket_send(mrb_state *mrb, mrb_value self)
dest
=
mrb_nil_value
();
dest
=
mrb_nil_value
();
mrb_get_args
(
mrb
,
"Si|S"
,
&
mesg
,
&
flags
,
&
dest
);
mrb_get_args
(
mrb
,
"Si|S"
,
&
mesg
,
&
flags
,
&
dest
);
if
(
mrb_nil_p
(
dest
))
{
if
(
mrb_nil_p
(
dest
))
{
n
=
send
(
socket_fd
(
mrb
,
self
),
RSTRING_PTR
(
mesg
),
(
size_t
)
RSTRING_LEN
(
mesg
),
(
int
)
flags
);
n
=
send
(
socket_fd
(
mrb
,
self
),
RSTRING_PTR
(
mesg
),
(
f
size_t
)
RSTRING_LEN
(
mesg
),
(
int
)
flags
);
}
else
{
}
else
{
n
=
sendto
(
socket_fd
(
mrb
,
self
),
RSTRING_PTR
(
mesg
),
(
size_t
)
RSTRING_LEN
(
mesg
),
(
int
)
flags
,
(
const
struct
sockaddr
*
)
RSTRING_PTR
(
dest
),
RSTRING_LEN
(
dest
));
n
=
sendto
(
socket_fd
(
mrb
,
self
),
RSTRING_PTR
(
mesg
),
(
fsize_t
)
RSTRING_LEN
(
mesg
),
(
int
)
flags
,
(
const
struct
sockaddr
*
)
RSTRING_PTR
(
dest
),
(
fsize_t
)
RSTRING_LEN
(
dest
));
}
}
if
(
n
==
-
1
)
if
(
n
==
-
1
)
mrb_sys_fail
(
mrb
,
"send"
);
mrb_sys_fail
(
mrb
,
"send"
);
...
@@ -532,7 +534,7 @@ mrb_ipsocket_recvfrom(mrb_state *mrb, mrb_value self)
...
@@ -532,7 +534,7 @@ mrb_ipsocket_recvfrom(mrb_state *mrb, mrb_value self)
mrb_get_args
(
mrb
,
"i|i"
,
&
maxlen
,
&
flags
);
mrb_get_args
(
mrb
,
"i|i"
,
&
maxlen
,
&
flags
);
buf
=
mrb_str_buf_new
(
mrb
,
maxlen
);
buf
=
mrb_str_buf_new
(
mrb
,
maxlen
);
socklen
=
sizeof
(
ss
);
socklen
=
sizeof
(
ss
);
n
=
recvfrom
(
fd
,
RSTRING_PTR
(
buf
),
(
size_t
)
maxlen
,
(
int
)
flags
,
n
=
recvfrom
(
fd
,
RSTRING_PTR
(
buf
),
(
f
size_t
)
maxlen
,
(
int
)
flags
,
(
struct
sockaddr
*
)
&
ss
,
&
socklen
);
(
struct
sockaddr
*
)
&
ss
,
&
socklen
);
if
(
n
==
-
1
)
{
if
(
n
==
-
1
)
{
mrb_sys_fail
(
mrb
,
"recvfrom"
);
mrb_sys_fail
(
mrb
,
"recvfrom"
);
...
@@ -557,7 +559,7 @@ mrb_socket_gethostname(mrb_state *mrb, mrb_value cls)
...
@@ -557,7 +559,7 @@ mrb_socket_gethostname(mrb_state *mrb, mrb_value cls)
bufsize
=
256
;
bufsize
=
256
;
#endif
#endif
buf
=
mrb_str_buf_new
(
mrb
,
(
mrb_int
)
bufsize
);
buf
=
mrb_str_buf_new
(
mrb
,
(
mrb_int
)
bufsize
);
if
(
gethostname
(
RSTRING_PTR
(
buf
),
bufsize
)
!=
0
)
if
(
gethostname
(
RSTRING_PTR
(
buf
),
(
fsize_t
)
bufsize
)
!=
0
)
mrb_sys_fail
(
mrb
,
"gethostname"
);
mrb_sys_fail
(
mrb
,
"gethostname"
);
mrb_str_resize
(
mrb
,
buf
,
(
mrb_int
)
strlen
(
RSTRING_PTR
(
buf
)));
mrb_str_resize
(
mrb
,
buf
,
(
mrb_int
)
strlen
(
RSTRING_PTR
(
buf
)));
return
buf
;
return
buf
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment