Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1b4a8156
Commit
1b4a8156
authored
Mar 29, 2005
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fedora now defines read(2)/write(2) as macros.
Argh!
parent
2d666071
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
include/violite.h
include/violite.h
+2
-2
vio/test-ssl.c
vio/test-ssl.c
+2
-2
vio/test-sslclient.c
vio/test-sslclient.c
+2
-2
No files found.
include/violite.h
View file @
1b4a8156
...
...
@@ -138,8 +138,8 @@ int vio_close_shared_memory(Vio * vio);
#if defined(HAVE_VIO) && !defined(DONT_MAP_VIO)
#define vio_delete(vio) (vio)->viodelete(vio)
#define vio_errno(vio) (vio)->vioerrno(vio)
#define vio_read(vio, buf, size)
(vio)->read
(vio,buf,size)
#define vio_write(vio, buf, size)
(vio)->write
(vio, buf, size)
#define vio_read(vio, buf, size)
((vio)->read)
(vio,buf,size)
#define vio_write(vio, buf, size)
((vio)->write)
(vio, buf, size)
#define vio_blocking(vio, set_blocking_mode, old_mode)\
(vio)->vioblocking(vio, set_blocking_mode, old_mode)
#define vio_is_blocking(vio) (vio)->is_blocking(vio)
...
...
vio/test-ssl.c
View file @
1b4a8156
...
...
@@ -115,7 +115,7 @@ main(int argc, char** argv)
{
/* child, therefore, client */
char
xbuf
[
100
];
int
r
=
client_vio
->
read
(
client_vio
,
xbuf
,
sizeof
(
xbuf
));
int
r
=
vio_
read
(
client_vio
,
xbuf
,
sizeof
(
xbuf
));
if
(
r
<=
0
)
{
my_free
((
gptr
)
ssl_acceptor
,
MYF
(
0
));
my_free
((
gptr
)
ssl_connector
,
MYF
(
0
));
...
...
@@ -130,7 +130,7 @@ main(int argc, char** argv)
else
{
const
char
*
s
=
"Huhuhuh"
;
int
r
=
server_vio
->
write
(
server_vio
,(
gptr
)
s
,
strlen
(
s
));
int
r
=
vio_
write
(
server_vio
,(
gptr
)
s
,
strlen
(
s
));
if
(
r
<=
0
)
{
my_free
((
gptr
)
ssl_acceptor
,
MYF
(
0
));
my_free
((
gptr
)
ssl_connector
,
MYF
(
0
));
...
...
vio/test-sslclient.c
View file @
1b4a8156
...
...
@@ -77,13 +77,13 @@ main( int argc __attribute__((unused)),
sa
.
sin_port
=
htons
(
1111
);
/* Server Port number */
err
=
connect
(
client_vio
->
sd
,
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
));
sizeof
(
sa
));
/* ----------------------------------------------- */
/* Now we have TCP conncetion. Start SSL negotiation. */
read
(
client_vio
->
sd
,
xbuf
,
sizeof
(
xbuf
));
sslconnect
(
ssl_connector
,
client_vio
,
60L
);
err
=
client_vio
->
read
(
client_vio
,
xbuf
,
sizeof
(
xbuf
));
err
=
vio_
read
(
client_vio
,
xbuf
,
sizeof
(
xbuf
));
if
(
err
<=
0
)
{
my_free
((
gptr
)
ssl_connector
,
MYF
(
0
));
fatal_error
(
"client:SSL_read"
);
...
...
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