Some missing from merge.

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

View file

@ -1,3 +1,5 @@
// $Id: OS_NS_string.cpp 97884 2014-09-08 18:00:53Z johnnyw $
#include "ace/ACE.h"
#include "ace/Global_Macros.h"
#include "ace/OS_NS_string.h"
@ -8,10 +10,6 @@
# include "ace/OS_NS_string.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if defined (ACE_LACKS_MEMCHR)
@ -36,12 +34,7 @@ ACE_OS::memchr_emulation (const void *s, int c, size_t len)
char *
ACE_OS::strdup_emulation (const char *s)
{
#if defined (ACE_HAS_ALLOC_HOOKS)
char *t = (char *) ACE_Allocator::instance()->malloc (ACE_OS::strlen (s) + 1);
#else
char *t = (char *) ACE_OS::malloc (ACE_OS::strlen (s) + 1);
#endif /* ACE_HAS_ALLOC_HOOKS */
if (t == 0)
return 0;
@ -69,8 +62,8 @@ ACE_OS::strdup_emulation (const wchar_t *s)
char *
ACE_OS::strecpy (char *s, const char *t)
{
char *dscan = s;
const char *sscan = t;
ACE_REGISTER char *dscan = s;
ACE_REGISTER const char *sscan = t;
while ((*dscan++ = *sscan++) != '\0')
continue;
@ -82,8 +75,8 @@ ACE_OS::strecpy (char *s, const char *t)
wchar_t *
ACE_OS::strecpy (wchar_t *s, const wchar_t *t)
{
wchar_t *dscan = s;
const wchar_t *sscan = t;
ACE_REGISTER wchar_t *dscan = s;
ACE_REGISTER const wchar_t *sscan = t;
while ((*dscan++ = *sscan++) != ACE_TEXT_WIDE ('\0'))
continue;
@ -134,7 +127,7 @@ ACE_OS::strerror (int errnum)
if (errno == EINVAL || errmsg == 0 || errmsg[0] == 0)
{
ACE_OS::snprintf (ret_errortext, 128, "Unknown error %d", errnum);
ACE_OS::sprintf (ret_errortext, "Unknown error %d", errnum);
errmsg = ret_errortext;
g = EINVAL;
}
@ -153,6 +146,7 @@ ACE_OS::strerror_emulation (int)
}
#endif /* ACE_LACKS_STRERROR */
char *
ACE_OS::strsignal (int signum)
{
@ -169,41 +163,25 @@ ACE_OS::strsignal (int signum)
if (ret_val <= reinterpret_cast<char *> (0))
{
ACE_OS::snprintf (signal_text, 128, "Unknown signal: %d", signum);
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::snprintf (signal_text, 128, "Unknown signal: %d", signum);
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::snprintf (signal_text, 128, "Signal: %d", signum);
ACE_OS::sprintf (signal_text, "Signal: %d", signum);
return signal_text;
# endif /* ACE_SYS_SIGLIST */
#endif /* ACE_HAS_STRSIGNAL */
}
char *
ACE_OS::strerror_r (int errnum, char *buf, size_t buflen)
{
#ifdef ACE_HAS_STRERROR_R
# ifdef ACE_HAS_STRERROR_R_XSI
if (::strerror_r (errnum, buf, buflen) == 0)
return buf;
return const_cast <char*> ("Unknown Error");
# else
return ::strerror_r (errnum, buf, buflen);
# endif
#else
return ACE_OS::strncpy (buf, strerror (errnum), buflen);
#endif
}
const char *
ACE_OS::strnchr (const char *s, int c, size_t len)
{
@ -342,9 +320,9 @@ ACE_OS::strrchr_emulation (const char *s, int c)
char *
ACE_OS::strsncpy (char *dst, const char *src, size_t maxlen)
{
char *rdst = dst;
const char *rsrc = src;
size_t rmaxlen = maxlen;
ACE_REGISTER char *rdst = dst;
ACE_REGISTER const char *rsrc = src;
ACE_REGISTER size_t rmaxlen = maxlen;
if (rmaxlen > 0)
{
@ -368,9 +346,9 @@ ACE_OS::strsncpy (char *dst, const char *src, size_t maxlen)
ACE_WCHAR_T *
ACE_OS::strsncpy (ACE_WCHAR_T *dst, const ACE_WCHAR_T *src, size_t maxlen)
{
ACE_WCHAR_T *rdst = dst;
const ACE_WCHAR_T *rsrc = src;
size_t rmaxlen = maxlen;
ACE_REGISTER ACE_WCHAR_T *rdst = dst;
ACE_REGISTER const ACE_WCHAR_T *rsrc = src;
ACE_REGISTER size_t rmaxlen = maxlen;
if (rmaxlen > 0)
{