No changes, just de-TAB gsocket.cpp.
TABs must be removed before committing other (significant) changes to this file which would otherwise be blocked by svn commit hook. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@66975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -198,8 +198,8 @@ int _System soclose(int);
|
||||
|
||||
#if defined(HAVE_GETHOSTBYNAME)
|
||||
static struct hostent * deepCopyHostent(struct hostent *h,
|
||||
const struct hostent *he,
|
||||
char *buffer, int size, int *err)
|
||||
const struct hostent *he,
|
||||
char *buffer, int size, int *err)
|
||||
{
|
||||
/* copy old structure */
|
||||
memcpy(h, he, sizeof(struct hostent));
|
||||
@@ -283,7 +283,7 @@ static struct hostent * deepCopyHostent(struct hostent *h,
|
||||
static wxMutex nameLock;
|
||||
#endif
|
||||
struct hostent * wxGethostbyname_r(const char *hostname, struct hostent *h,
|
||||
void *buffer, int size, int *err)
|
||||
void *buffer, int size, int *err)
|
||||
|
||||
{
|
||||
struct hostent *he = NULL;
|
||||
@@ -318,20 +318,20 @@ struct hostent * wxGethostbyname_r(const char *hostname, struct hostent *h,
|
||||
static wxMutex addrLock;
|
||||
#endif
|
||||
struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size,
|
||||
int proto, struct hostent *h,
|
||||
void *buffer, int size, int *err)
|
||||
int proto, struct hostent *h,
|
||||
void *buffer, int size, int *err)
|
||||
{
|
||||
struct hostent *he = NULL;
|
||||
*err = 0;
|
||||
#if defined(HAVE_FUNC_GETHOSTBYNAME_R_6)
|
||||
if (gethostbyaddr_r(addr_buf, buf_size, proto, h,
|
||||
(char*)buffer, size, &he, err))
|
||||
(char*)buffer, size, &he, err))
|
||||
he = NULL;
|
||||
#elif defined(HAVE_FUNC_GETHOSTBYNAME_R_5)
|
||||
he = gethostbyaddr_r(addr_buf, buf_size, proto, h, (char*)buffer, size, err);
|
||||
#elif defined(HAVE_FUNC_GETHOSTBYNAME_R_3)
|
||||
if (gethostbyaddr_r(addr_buf, buf_size, proto, h,
|
||||
(struct hostent_data*) buffer))
|
||||
(struct hostent_data*) buffer))
|
||||
{
|
||||
he = NULL;
|
||||
*err = h_errno;
|
||||
@@ -353,8 +353,8 @@ struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size,
|
||||
|
||||
#if defined(HAVE_GETSERVBYNAME)
|
||||
static struct servent * deepCopyServent(struct servent *s,
|
||||
const struct servent *se,
|
||||
char *buffer, int size)
|
||||
const struct servent *se,
|
||||
char *buffer, int size)
|
||||
{
|
||||
/* copy plain old structure */
|
||||
memcpy(s, se, sizeof(struct servent));
|
||||
@@ -418,7 +418,7 @@ static struct servent * deepCopyServent(struct servent *s,
|
||||
static wxMutex servLock;
|
||||
#endif
|
||||
struct servent *wxGetservbyname_r(const char *port, const char *protocol,
|
||||
struct servent *serv, void *buffer, int size)
|
||||
struct servent *serv, void *buffer, int size)
|
||||
{
|
||||
struct servent *se = NULL;
|
||||
#if defined(HAVE_FUNC_GETSERVBYNAME_R_6)
|
||||
@@ -2132,7 +2132,7 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
|
||||
#endif
|
||||
struct servent serv;
|
||||
se = wxGetservbyname_r(port, protocol, &serv,
|
||||
(void*)&buffer, sizeof(buffer));
|
||||
(void*)&buffer, sizeof(buffer));
|
||||
if (!se)
|
||||
{
|
||||
/* the cast to int suppresses compiler warnings about subscript having the
|
||||
@@ -2191,7 +2191,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
|
||||
#endif
|
||||
int err;
|
||||
he = wxGethostbyaddr_r(addr_buf, sizeof(addr->sin_addr), AF_INET, &temphost,
|
||||
(void*)&buffer, sizeof(buffer), &err);
|
||||
(void*)&buffer, sizeof(buffer), &err);
|
||||
if (he == NULL)
|
||||
{
|
||||
address->m_error = GSOCK_NOHOST;
|
||||
|
Reference in New Issue
Block a user