Commit 98473a83 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Small refactoring in vio.

 - remove function prototype for shared memory (no more used), and VIO
members that are unused
 - Do not call DisconnectNamedPipe on pipe handle. CloseHandle() is enough.
parent 8f329e8d
...@@ -68,13 +68,6 @@ Vio* vio_new(my_socket sd, enum enum_vio_type type, uint flags); ...@@ -68,13 +68,6 @@ Vio* vio_new(my_socket sd, enum enum_vio_type type, uint flags);
Vio* mysql_socket_vio_new(MYSQL_SOCKET mysql_socket, enum enum_vio_type type, uint flags); Vio* mysql_socket_vio_new(MYSQL_SOCKET mysql_socket, enum enum_vio_type type, uint flags);
#ifdef __WIN__ #ifdef __WIN__
Vio* vio_new_win32pipe(HANDLE hPipe); Vio* vio_new_win32pipe(HANDLE hPipe);
Vio* vio_new_win32shared_memory(HANDLE handle_file_map,
HANDLE handle_map,
HANDLE event_server_wrote,
HANDLE event_server_read,
HANDLE event_client_wrote,
HANDLE event_client_read,
HANDLE event_conn_closed);
#else #else
#define HANDLE void * #define HANDLE void *
#endif /* __WIN__ */ #endif /* __WIN__ */
...@@ -268,8 +261,6 @@ struct st_vio ...@@ -268,8 +261,6 @@ struct st_vio
#ifdef _WIN32 #ifdef _WIN32
HANDLE hPipe; HANDLE hPipe;
OVERLAPPED overlapped; OVERLAPPED overlapped;
DWORD read_timeout_ms;
DWORD write_timeout_ms;
#endif #endif
}; };
#endif /* vio_violite_h_ */ #endif /* vio_violite_h_ */
...@@ -131,7 +131,6 @@ int vio_close_pipe(Vio *vio) ...@@ -131,7 +131,6 @@ int vio_close_pipe(Vio *vio)
CancelIo(vio->hPipe); CancelIo(vio->hPipe);
CloseHandle(vio->overlapped.hEvent); CloseHandle(vio->overlapped.hEvent);
DisconnectNamedPipe(vio->hPipe);
ret= CloseHandle(vio->hPipe); ret= CloseHandle(vio->hPipe);
vio->type= VIO_CLOSED; vio->type= VIO_CLOSED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment