database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

portability fix: use SOCKET_SIZE_TYPE in the handlersocket plugin

Browse Source
This commit is contained in:
Sergei Golubchik
2011-09-24 14:45:49 +02:00
parent 14c767ca48
commit 5c4d7c6625
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
View File

@ -63,7 +63,7 @@ struct hstcpsvr_conn : public dbcallback_i {
public: public:
auto_file fd; auto_file fd;
sockaddr_storage addr; sockaddr_storage addr;
socklen_t addr_len; size_socket addr_len;
dbconnstate cstate; dbconnstate cstate;
std::string err; std::string err;
size_t readsize; size_t readsize;

3
plugin/handler_socket/libhsclient/auto_addrinfo.hpp
View File

@ -9,12 +9,15 @@
#ifndef DENA_AUTO_ADDRINFO_HPP #ifndef DENA_AUTO_ADDRINFO_HPP
#define DENA_AUTO_ADDRINFO_HPP #define DENA_AUTO_ADDRINFO_HPP
#include <my_config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include "util.hpp" #include "util.hpp"
typedef SOCKET_SIZE_TYPE size_socket;
namespace dena { namespace dena {
struct auto_addrinfo : private noncopyable { struct auto_addrinfo : private noncopyable {

2
plugin/handler_socket/libhsclient/socket.cpp
View File

@ -172,7 +172,7 @@ socket_bind(auto_file& fd, const socket_args& args, std::string& err_r)
int int
socket_accept(int listen_fd, auto_file& fd, const socket_args& args, socket_accept(int listen_fd, auto_file& fd, const socket_args& args,
sockaddr_storage& addr_r, socklen_t& addrlen_r, std::string& err_r) sockaddr_storage& addr_r, size_socket& addrlen_r, std::string& err_r)
{ {
fd.reset(accept(listen_fd, reinterpret_cast<sockaddr *>(&addr_r), fd.reset(accept(listen_fd, reinterpret_cast<sockaddr *>(&addr_r),
&addrlen_r)); &addrlen_r));

4
plugin/handler_socket/libhsclient/socket.hpp
View File

@ -19,7 +19,7 @@ namespace dena {
struct socket_args { struct socket_args {
sockaddr_storage addr; sockaddr_storage addr;
socklen_t addrlen; size_socket addrlen;
int family; int family;
int socktype; int socktype;
int protocol; int protocol;
@ -43,7 +43,7 @@ void ignore_sigpipe();
int socket_bind(auto_file& fd, const socket_args& args, std::string& err_r); int socket_bind(auto_file& fd, const socket_args& args, std::string& err_r);
int socket_connect(auto_file& fd, const socket_args& args, std::string& err_r); int socket_connect(auto_file& fd, const socket_args& args, std::string& err_r);
int socket_accept(int listen_fd, auto_file& fd, const socket_args& args, int socket_accept(int listen_fd, auto_file& fd, const socket_args& args,
sockaddr_storage& addr_r, socklen_t& addrlen_r, std::string& err_r); sockaddr_storage& addr_r, size_socket& addrlen_r, std::string& err_r);
}; };