mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

19
dep/acelite/ace/UNIX_Addr.cpp
View file

@ -1,13 +1,11 @@
// $Id: UNIX_Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $
#include "ace/UNIX_Addr.h"
#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
#if !defined (__ACE_INLINE__)
#include "ace/UNIX_Addr.inl"
#endif /* __ACE_INLINE__ */
@ -18,12 +16,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_UNIX_Addr)
// Set a pointer to the address.
void
ACE_UNIX_Addr::set_addr (const void *addr, int len)
ACE_UNIX_Addr::set_addr (void *addr, int len)
{
ACE_TRACE ("ACE_UNIX_Addr::set_addr");
this->ACE_Addr::base_set (AF_UNIX, len);
ACE_OS::memcpy (&this->unix_addr_, addr, len);
ACE_OS::memcpy ((void *) &this->unix_addr_,
(void *) addr,
len);
}
// Return a pointer to the underlying address.
@ -41,10 +41,6 @@ ACE_UNIX_Addr::string_to_addr (const char addr[])
{
ACE_OS::strsncpy (this->unix_addr_.sun_path, addr,
sizeof this->unix_addr_.sun_path);
this->set_size (sizeof this->unix_addr_ -
sizeof (this->unix_addr_.sun_path) +
ACE_OS::strlen (this->unix_addr_.sun_path));
return 0;
}
@ -75,8 +71,7 @@ ACE_UNIX_Addr::dump (void) const
// Do nothing constructor.
ACE_UNIX_Addr::ACE_UNIX_Addr (void)
: ACE_Addr (AF_UNIX,
sizeof this->unix_addr_ - sizeof (this->unix_addr_.sun_path))
: ACE_Addr (AF_UNIX, sizeof this->unix_addr_)
{
(void) ACE_OS::memset ((void *) &this->unix_addr_,
0,