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

[10643] Update the ACE part we use to 5.8.2

Browse source 
Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-10-25 20:36:51 +02:00
parent 8f71d95c0d
commit 23c920ca4b
739 changed files with 22031 additions and 40373 deletions
Download patch file Download diff file Expand all files Collapse all files

100
dep/ACE_wrappers/ace/OS_NS_string.cpp
View file

@ -1,25 +1,14 @@
// $Id: OS_NS_string.cpp 80826 2008-03-04 14:51:23Z wotte $
// $Id: OS_NS_string.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_stdlib.h"
#include "ace/ACE.h"
ACE_RCSID (ace,
OS_NS_string,
"$Id: OS_NS_string.cpp 80826 2008-03-04 14:51:23Z wotte $")
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_stdlib.h"
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_string.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
#if defined (ACE_HAS_WCHAR)
# include "ace/OS_NS_stdlib.h"
#endif /* ACE_HAS_WCHAR */
#if !defined (ACE_LACKS_STRERROR)
# include "ace/OS_NS_stdio.h"
#endif /* ACE_LACKS_STRERROR */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if defined (ACE_LACKS_MEMCHR)
@ -125,6 +114,9 @@ ACE_OS::strerror (int errnum)
errmsg = ret_errortext;
ACE_SECURECRTCALL (strerror_s (ret_errortext, sizeof(ret_errortext), errnum),
char *, 0, errmsg);
if (errnum < 0 || errnum >= _sys_nerr)
g = EINVAL;
return errmsg;
#elif defined (ACE_WIN32)
if (errnum < 0 || errnum >= _sys_nerr)
@ -147,12 +139,48 @@ ACE_OS::strerror (int errnum)
* Just returns "Unknown Error" all the time.
*/
char *
ACE_OS::strerror_emulation (int errnum)
ACE_OS::strerror_emulation (int)
{
return "Unknown Error";
return const_cast <char*> ("Unknown Error");
}
#endif /* ACE_LACKS_STRERROR */
char *
ACE_OS::strsignal (int signum)
{
static char signal_text[128];
#if defined (ACE_HAS_STRSIGNAL)
char *ret_val = 0;
# if defined (ACE_NEEDS_STRSIGNAL_RANGE_CHECK)
if (signum < 0 || signum >= ACE_NSIG)
ret_val = 0;
else
# endif /* (ACE_NEEDS_STRSIGNAL_RANGE_CHECK */
ret_val = ACE_STD_NAMESPACE::strsignal (signum);
if (ret_val <= reinterpret_cast<char *> (0))
{
ACE_OS::sprintf (signal_text, "Unknown signal: %d", signum);
ret_val = signal_text;
}
return ret_val;
#else
if (signum < 0 || signum >= ACE_NSIG)
{
ACE_OS::sprintf (signal_text, "Unknown signal: %d", signum);
return signal_text;
}
# if defined (ACE_SYS_SIGLIST)
return ACE_SYS_SIGLIST[signum];
# else
ACE_OS::sprintf (signal_text, "Signal: %d", signum);
return signal_text;
# endif /* ACE_SYS_SIGLIST */
#endif /* ACE_HAS_STRSIGNAL */
}
const char *
ACE_OS::strnchr (const char *s, int c, size_t len)
{
@ -167,8 +195,12 @@ const ACE_WCHAR_T *
ACE_OS::strnchr (const ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len)
{
for (size_t i = 0; i < len; ++i)
if (s[i] == c)
return s + i;
{
if (s[i] == c)
{
return s + i;
}
}
return 0;
}
@ -189,8 +221,10 @@ ACE_OS::strnstr (const char *s1, const char *s2, size_t len2)
for (size_t i = 0; i <= len; i++)
{
if (ACE_OS::memcmp (s1 + i, s2, len2) == 0)
// Found a match! Return the index.
return s1 + i;
{
// Found a match! Return the index.
return s1 + i;
}
}
return 0;
@ -200,20 +234,22 @@ const ACE_WCHAR_T *
ACE_OS::strnstr (const ACE_WCHAR_T *s1, const ACE_WCHAR_T *s2, size_t len2)
{
// Substring length
const size_t len1 = ACE_OS::strlen (s1);
size_t const len1 = ACE_OS::strlen (s1);
// Check if the substring is longer than the string being searched.
if (len2 > len1)
return 0;
// Go upto <len>
const size_t len = len1 - len2;
size_t const len = len1 - len2;
for (size_t i = 0; i <= len; i++)
{
if (ACE_OS::memcmp (s1 + i, s2, len2 * sizeof (ACE_WCHAR_T)) == 0)
// Found a match! Return the index.
return s1 + i;
{
// Found a match! Return the index.
return s1 + i;
}
}
return 0;
@ -293,7 +329,9 @@ ACE_OS::strsncpy (char *dst, const char *src, size_t maxlen)
{
*rdst = '\0';
if (rsrc != 0)
strncat (rdst, rsrc, --rmaxlen);
{
ACE_OS::strncat (rdst, rsrc, --rmaxlen);
}
}
else
{
@ -313,11 +351,13 @@ ACE_OS::strsncpy (ACE_WCHAR_T *dst, const ACE_WCHAR_T *src, size_t maxlen)
if (rmaxlen > 0)
{
if (rdst!=rsrc)
if (rdst!= rsrc)
{
*rdst = ACE_TEXT_WIDE ('\0');
if (rsrc != 0)
strncat (rdst, rsrc, --rmaxlen);
{
ACE_OS::strncat (rdst, rsrc, --rmaxlen);
}
}
else
{
@ -339,11 +379,11 @@ ACE_OS::strtok_r_emulation (char *s, const char *tokens, char **lasts)
*lasts = s;
if (*s == 0) // We have reached the end
return 0;
size_t l_org = ACE_OS::strlen (s);
size_t const l_org = ACE_OS::strlen (s);
s = ::strtok (s, tokens);
if (s == 0)
return 0;
const size_t l_sub = ACE_OS::strlen (s);
size_t const l_sub = ACE_OS::strlen (s);
if (s + l_sub < *lasts + l_org)
*lasts = s + l_sub + 1;
else