Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Cleaning up unicode conversion

Browse source
This commit is contained in:
kaetemi 2019-05-01 11:52:03 +08:00
parent b59efe8ff0
commit 83fdb7b4a1
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/include/nel/misc/string_common.h
View file

@ -357,9 +357,6 @@ inline tstring mbcsToTStr(const std::string &str) { return (const tstring &)str;
#define nlMbcsToTStr(str) ((const tchar *)NLMISC::asCStr(str)) #define nlMbcsToTStr(str) ((const tchar *)NLMISC::asCStr(str))
#endif #endif
inline const tchar *asCStr(const tchar *str) { return str; }
inline const tchar *asCStr(const tstring &str) { return str.c_str(); }
} // NLMISC } // NLMISC
#endif // NL_STRING_COMMON_H #endif // NL_STRING_COMMON_H

5
code/nel/include/nel/net/service.h
View file

@ -146,7 +146,7 @@ int nltmain(int argc, const NLMISC::tchar **argv) \
{ \ { \
NLMISC::CApplicationContext serviceContext; \ NLMISC::CApplicationContext serviceContext; \
__ServiceClassName *scn = new __ServiceClassName; \ __ServiceClassName *scn = new __ServiceClassName; \
scn->setArgs (argc, nlTStrToUtf8(argv)); \ scn->setArgs (argc, argv); \
createDebug(NULL,!scn->haveLongArg("nolog"));\ createDebug(NULL,!scn->haveLongArg("nolog"));\
scn->setCallbackArray (__ServiceCallbackArray, sizeof(__ServiceCallbackArray)/sizeof(__ServiceCallbackArray[0])); \ scn->setCallbackArray (__ServiceCallbackArray, sizeof(__ServiceCallbackArray)/sizeof(__ServiceCallbackArray[0])); \
sint retval = scn->main (__ServiceShortName, __ServiceLongName, __ServicePort, __ConfigDir, __LogDir, __DATE__ " " __TIME__); \ sint retval = scn->main (__ServiceShortName, __ServiceLongName, __ServicePort, __ConfigDir, __LogDir, __DATE__ " " __TIME__); \
@ -350,6 +350,9 @@ public:
/// Sets the command line and init _Args variable. You must call this before calling main() /// Sets the command line and init _Args variable. You must call this before calling main()
void setArgs (int argc, const char **argv); void setArgs (int argc, const char **argv);
/// Sets the command line and init _Args variable. You must call this before calling main()
void setArgs (int argc, const wchar_t **argv);
/// Sets the command line and init _Args variable. You must call this before calling main() /// Sets the command line and init _Args variable. You must call this before calling main()
void setArgs (const char *args); void setArgs (const char *args);

7
code/nel/src/net/service.cpp
View file

@ -492,6 +492,13 @@ void IService::setArgs (int argc, const char **argv)
} }
} }
void IService::setArgs(int argc, const wchar_t **argv)
{
for (sint i = 0; i < argc; i++)
{
_Args.push_back(nlWideToUtf8(argv[i]));
}
}
void cbLogFilter (CConfigFile::CVar &var) void cbLogFilter (CConfigFile::CVar &var)
{ {