gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17219) -Cleanup: remove a lot of unused string code

Browse Source
This commit is contained in:
yexo 2009-08-19 13:13:32 +00:00
parent 0fa0286ebb
commit 94198e09ce
8 changed files with 22 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openttd_vs80.vcproj
View File

@ -3367,10 +3367,6 @@
RelativePath=".\..\src\misc\str.hpp" RelativePath=".\..\src\misc\str.hpp"
> >
</File> </File>
<File
RelativePath=".\..\src\misc\strapi.hpp"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Network Core" Name="Network Core"

4
projects/openttd_vs90.vcproj
View File

@ -3364,10 +3364,6 @@
RelativePath=".\..\src\misc\str.hpp" RelativePath=".\..\src\misc\str.hpp"
> >
</File> </File>
<File
RelativePath=".\..\src\misc\strapi.hpp"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Network Core" Name="Network Core"

1
source.list
View File

@ -808,7 +808,6 @@ misc/dbg_helpers.h
misc/fixedsizearray.hpp misc/fixedsizearray.hpp
misc/hashtable.hpp misc/hashtable.hpp
misc/str.hpp misc/str.hpp
misc/strapi.hpp
# Network Core # Network Core
network/core/address.cpp network/core/address.cpp

3
src/misc/blob.hpp
View File

@ -52,9 +52,6 @@ protected:
/** type used as class member */ /** type used as class member */
union { union {
bitem_t *m_pData; ///< ptr to the first byte of data bitem_t *m_pData; ///< ptr to the first byte of data
#if defined(HAS_WCHAR)
wchar_t *m_pwData; ///< ptr to the first byte of data
#endif /* HAS_WCHAR */
CHdr *m_pHdr_1; ///< ptr just after the CHdr holding m_size and m_max_size CHdr *m_pHdr_1; ///< ptr just after the CHdr holding m_size and m_max_size
} ptr_u; } ptr_u;

117
src/misc/str.hpp
View File

@ -7,125 +7,65 @@
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include "strapi.hpp" #include "../string_func.h"
/** Blob based string. */ /** Blob based case sensitive ANSI/UTF-8 string */
template <typename Tchar, bool TcaseInsensitive> struct CStrA : public CBlobT<char>
struct CStrT : public CBlobT<Tchar>
{ {
typedef CBlobT<Tchar> base; ///< base class typedef CBlobT<char> base; ///< base class
typedef CStrApiT<Tchar, TcaseInsensitive> Api; ///< string API abstraction layer
typedef typename base::bsize_t bsize_t; ///< size type inherited from blob
typedef typename base::OnTransfer OnTransfer; ///< temporary 'transfer ownership' object type
/** Construction from C zero ended string. */ /** Create an empty CStrT */
FORCEINLINE CStrT(const Tchar *str = NULL) FORCEINLINE CStrA()
{ {
AppendStr(str);
}
/** Construction from C string and given number of characters. */
FORCEINLINE CStrT(const Tchar *str, bsize_t num_chars) : base(str, num_chars)
{
base::FixTail();
}
/** Construction from C string determined by 'begin' and 'end' pointers. */
FORCEINLINE CStrT(const Tchar *str, const Tchar *end)
: base(str, end - str)
{
base::FixTail();
}
/** Construction from blob contents. */
FORCEINLINE CStrT(const CBlobBaseSimple& src)
: base(src)
{
base::FixTail();
}
/** Copy constructor. */
FORCEINLINE CStrT(const CStrT& src)
: base(src)
{
base::FixTail();
} }
/** Take over ownership constructor */ /** Take over ownership constructor */
FORCEINLINE CStrT(const OnTransfer& ot) FORCEINLINE CStrA(const OnTransfer& ot)
: base(ot) : base(ot)
{ {
} }
/** Grow the actual buffer and fix the trailing zero at the end. */ /** Grow the actual buffer and fix the trailing zero at the end. */
FORCEINLINE Tchar *GrowSizeNC(bsize_t count) FORCEINLINE char *GrowSizeNC(bsize_t count)
{ {
Tchar *ret = base::GrowSizeNC(count); char *ret = base::GrowSizeNC(count);
base::FixTail(); base::FixTail();
return ret; return ret;
} }
/** Append zero-ended C string. */ /** Append zero-ended C string. */
FORCEINLINE void AppendStr(const Tchar *str) FORCEINLINE void AppendStr(const char *str)
{ {
if (str != NULL && str[0] != '\0') { if (!StrEmpty(str)) {
base::Append(str, (bsize_t)Api::StrLen(str)); base::Append(str, strlen(str));
base::FixTail();
}
}
/** Append another CStrT or blob. */
FORCEINLINE void Append(const CBlobBaseSimple& src)
{
if (src.RawSize() > 0) {
base::AppendRaw(src);
base::FixTail(); base::FixTail();
} }
} }
/** Assignment from C string. */ /** Assignment from C string. */
FORCEINLINE CStrT& operator = (const Tchar *src) FORCEINLINE CStrA& operator = (const char *src)
{ {
base::Clear(); base::Clear();
AppendStr(src); AppendStr(src);
return *this; return *this;
} }
/** Assignment from another CStrT or blob. */
FORCEINLINE CStrT& operator = (const CBlobBaseSimple& src)
{
base::Clear();
base::AppendRaw(src);
base::FixTail();
return *this;
}
/** Assignment from another CStrT or blob. */
FORCEINLINE CStrT& operator = (const CStrT& src)
{
base::Clear();
base::AppendRaw(src);
base::FixTail();
return *this;
}
/** Lower-than operator (to support stl collections) */ /** Lower-than operator (to support stl collections) */
FORCEINLINE bool operator < (const CStrT &other) const FORCEINLINE bool operator < (const CStrA &other) const
{ {
return (Api::StrCmp(base::Data(), other.Data()) < 0); return strcmp(base::Data(), other.Data()) < 0;
} }
/** Add formated string (like vsprintf) at the end of existing contents. */ /** Add formated string (like vsprintf) at the end of existing contents. */
int AddFormatL(const Tchar *format, va_list args) int AddFormatL(const char *format, va_list args)
{ {
bsize_t addSize = Api::StrLen(format); bsize_t addSize = max<size_t>(strlen(format), 16);
if (addSize < 16) addSize = 16;
addSize += addSize / 2; addSize += addSize / 2;
int ret; int ret;
int err = 0; int err = 0;
for (;;) { for (;;) {
Tchar *buf = MakeFreeSpace(addSize); char *buf = MakeFreeSpace(addSize);
ret = Api::SPrintFL(buf, base::GetReserve(), format, args); ret = vsnprintf(buf, base::GetReserve(), format, args);
if (ret >= base::GetReserve()) { if (ret >= base::GetReserve()) {
/* Greater return than given count means needed buffer size. */ /* Greater return than given count means needed buffer size. */
addSize = ret + 1; addSize = ret + 1;
@ -152,7 +92,7 @@ struct CStrT : public CBlobT<Tchar>
} }
/** Add formated string (like sprintf) at the end of existing contents. */ /** Add formated string (like sprintf) at the end of existing contents. */
int AddFormat(const Tchar *format, ...) int AddFormat(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
@ -161,16 +101,8 @@ struct CStrT : public CBlobT<Tchar>
return ret; return ret;
} }
/** Assign formated string (like vsprintf). */
int FormatL(const Tchar *format, va_list args)
{
base::Free();
int ret = AddFormatL(format, args);
return ret;
}
/** Assign formated string (like sprintf). */ /** Assign formated string (like sprintf). */
int Format(const Tchar *format, ...) int Format(const char *format, ...)
{ {
base::Free(); base::Free();
va_list args; va_list args;
@ -181,11 +113,4 @@ struct CStrT : public CBlobT<Tchar>
} }
}; };
typedef CStrT<char , false> CStrA; ///< Case sensitive ANSI/UTF-8 string
typedef CStrT<char , true > CStrCiA; ///< Case insensitive ANSI/UTF-8 string
#if defined(HAS_WCHAR)
typedef CStrT<wchar_t, false> CStrW; ///< Case sensitive unicode string
typedef CStrT<wchar_t, true > CStrCiW; ///< Case insensitive unicode string
#endif /* HAS_WCHAR */
#endif /* STR_HPP */ #endif /* STR_HPP */

101
src/misc/strapi.hpp
View File

@ -1,101 +0,0 @@
/* $Id$ */
/** @file strapi.hpp More string formatting? */
#ifndef STRAPI_HPP
#define STRAPI_HPP
#include <string.h>
#if defined(HAS_WCHAR)
#include <wchar.h>
#if !defined(_MSC_VER)
#define _stricmp strcmp
#define _wcsicmp wcscmp
#endif /* !defined(_MSC_VER) */
#endif /* HAS_WCHAR */
/** String API mapper base - just mapping by character type, not by case sensitivity yet.
* Class template CStrApiBaseT declaration is general, but following inline method
* definitions are specialized by character type. Class is not used directly, but only
* as a base class for template class CStrApiT */
template <typename Tchar>
class CStrApiBaseT
{
public:
/** ::strlen wrapper */
static size_t StrLen(const Tchar *s);
static int SPrintFL(Tchar *buf, size_t count, const Tchar *fmt, va_list args);
};
/** ::strlen wrapper specialization for char */
template <> /* static */ inline size_t CStrApiBaseT<char>::StrLen(const char *s)
{
return ::strlen(s);
}
/** ::vsprintf wrapper specialization for char */
template <> /* static */ inline int CStrApiBaseT<char>::SPrintFL(char *buf, size_t count, const char *fmt, va_list args)
{
#if defined(_MSC_VER) && !defined(WINCE)
return ::vsnprintf_s(buf, count, count - 1, fmt, args);
#else
return ::vsnprintf(buf, count, fmt, args);
#endif /* _MSC_VER && ! WINCE */
}
#if defined(HAS_WCHAR)
/** ::strlen wrapper specialization for wchar_t */
template <> /* static */ inline size_t CStrApiBaseT<wchar_t>::StrLen(const wchar_t *s)
{
return ::wcslen(s);
}
/** ::vsprintf wrapper specialization for wchar_t */
template <> /* static */ inline int CStrApiBaseT<wchar_t>::SPrintFL(wchar_t *buf, size_t count, const wchar_t *fmt, va_list args)
{
#if defined(_MSC_VER) && !defined(WINCE)
return ::_vsnwprintf_s(buf, count, count - 1, fmt, args);
#else
# if defined(_WIN32)
return ::_vsnwprintf(buf, count, fmt, args);
# else /* !_WIN32 */
return ::vswprintf(buf, count, fmt, args);
# endif /* !_WIN32 */
#endif /* _MSC_VER && ! WINCE */
}
#endif /* HAS_WCHAR */
template <typename Tchar, bool TcaseInsensitive>
class CStrApiT : public CStrApiBaseT<Tchar>
{
public:
static int StrCmp(const Tchar *s1, const Tchar *s2);
};
template <> /* static */ inline int CStrApiT<char, false>::StrCmp(const char *s1, const char *s2)
{
return ::strcmp(s1, s2);
}
template <> /* static */ inline int CStrApiT<char, true>::StrCmp(const char *s1, const char *s2)
{
return ::_stricmp(s1, s2);
}
#if defined(HAS_WCHAR)
template <> /* static */ inline int CStrApiT<wchar_t, false>::StrCmp(const wchar_t *s1, const wchar_t *s2)
{
return ::wcscmp(s1, s2);
}
template <> /* static */ inline int CStrApiT<wchar_t, true>::StrCmp(const wchar_t *s1, const wchar_t *s2)
{
return ::_wcsicmp(s1, s2);
}
#endif /* HAS_WCHAR */
#endif /* STRAPI_HPP */

5
src/stdafx.h
View File

@ -365,11 +365,6 @@ void NORETURN CDECL error(const char *str, ...) WARN_FORMAT(1, 2);
#define _stricmp strcasecmp #define _stricmp strcasecmp
#endif #endif
#if !defined(MORPHOS) && !defined(OPENBSD) && !defined(__NDS__) && !defined(__DJGPP__)
/* NDS, MorphOS & OpenBSD don't know wchars, the rest does :( */
#define HAS_WCHAR
#endif /* !defined(MORPHOS) && !defined(OPENBSD) && !defined(__NDS__) */
#if !defined(MAX_PATH) #if !defined(MAX_PATH)
#define MAX_PATH 260 #define MAX_PATH 260
#endif #endif

2
src/strings.cpp
View File

@ -719,7 +719,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
const char *s = GetStringPtr(argv_orig[(byte)*str++]); // contains the string that determines gender. const char *s = GetStringPtr(argv_orig[(byte)*str++]); // contains the string that determines gender.
int gender = 0; int gender = 0;
if (s != NULL) { if (s != NULL) {
wchar_t c = Utf8Consume(&s); WChar c = Utf8Consume(&s);
/* Switch case is always put before genders, so remove those bits */ /* Switch case is always put before genders, so remove those bits */
if (c == SCC_SWITCH_CASE) { if (c == SCC_SWITCH_CASE) {
/* Skip to the last (i.e. default) case */ /* Skip to the last (i.e. default) case */