tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

updated to the new Pikotools api (new Space struct)

Browse Source
This commit is contained in:
Tomasz Sowa
2021-04-09 17:50:58 +02:00
parent 00b980e74b
commit 35e10ed469
52 changed files with 795 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
winixd/functions/env.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2018, Tomasz Sowa
* Copyright (c) 2012-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,10 +74,10 @@ return true;
bool Env::Parse(const std::wstring & env_str)
{
space.Clear();
space.clear();
conf_parser.SetSpace(space);
return (conf_parser.ParseString(env_str) == PT::SpaceParser::ok);
return (conf_parser.ParseSpace(env_str) == PT::SpaceParser::ok);
}
@@ -102,10 +102,10 @@ bool Env::EditAdminEnv(long user_id, const std::wstring & env_str, bool use_ses_
}
else
{
log << log2 << "Env: Syntax error in line: " << conf_parser.line << logend;
log << log2 << "Env: Syntax error in line: " << conf_parser.get_last_parsed_line() << logend;
if( use_ses_log )
slog << logerror << T("syntax_error_in_line") << ' ' << conf_parser.line << logend;
slog << logerror << T("syntax_error_in_line") << ' ' << conf_parser.get_last_parsed_line() << logend;
}
return false;
@@ -133,10 +133,10 @@ bool Env::EditEnv(long user_id, const std::wstring & env_str, bool use_ses_log)
}
else
{
log << log2 << "Env: Syntax error in line: " << conf_parser.line << logend;
log << log2 << "Env: Syntax error in line: " << conf_parser.get_last_parsed_line() << logend;
if( use_ses_log )
slog << logerror << T("syntax_error_in_line") << ' ' << conf_parser.line << logend;
slog << logerror << T("syntax_error_in_line") << ' ' << conf_parser.get_last_parsed_line() << logend;
}
return false;