Changed: #1440 Typos

--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 12 years ago
parent acf6a8981f
commit 7fd3252564

@ -3,24 +3,24 @@
* \brief CToolLogger * \brief CToolLogger
* \date 2012-02-19 10:33GMT * \date 2012-02-19 10:33GMT
* \author Jan Boon (Kaetemi) * \author Jan Boon (Kaetemi)
* Tool logger is fully implemented in header so small tools do not * Tool logger is fully implemented in header so small tools do not
* need to link to this library unnecessarily. * need to link to this library unnecessarily.
*/ */
/* /*
* Copyright (C) 2012 by authors * Copyright (C) 2012 by authors
* *
* This file is part of RYZOM CORE PIPELINE. * This file is part of RYZOM CORE PIPELINE.
* RYZOM CORE PIPELINE is free software: you can redistribute it * RYZOM CORE PIPELINE is free software: you can redistribute it
* and/or modify it under the terms of the GNU General Public License * and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 2 of * as published by the Free Software Foundation, either version 2 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* RYZOM CORE PIPELINE is distributed in the hope that it will be * RYZOM CORE PIPELINE is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RYZOM CORE PIPELINE; see the file COPYING. If not, see * along with RYZOM CORE PIPELINE; see the file COPYING. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
@ -32,6 +32,8 @@
// STL includes // STL includes
#include <string> #include <string>
#include <stdio.h>
#include <stdlib.h>
// NeL includes // NeL includes
#include <nel/misc/time_nl.h> #include <nel/misc/time_nl.h>
@ -48,16 +50,16 @@ namespace {
#endif #endif
enum TError enum TError
{ {
ERROR, ERROR,
WARNING, WARNING,
MESSAGE, MESSAGE,
}; };
enum TDepend enum TDepend
{ {
BUILD, BUILD,
DIRECTORY, DIRECTORY,
RUNTIME, RUNTIME,
}; };
const std::string s_ErrorHeader = "type\tpath\ttime\terror"; const std::string s_ErrorHeader = "type\tpath\ttime\terror";

@ -6,20 +6,20 @@
* CPipelinePluginMax * CPipelinePluginMax
*/ */
/* /*
* Copyright (C) 2012 by authors * Copyright (C) 2012 by authors
* *
* This file is part of RYZOM CORE PIPELINE. * This file is part of RYZOM CORE PIPELINE.
* RYZOM CORE PIPELINE is free software: you can redistribute it * RYZOM CORE PIPELINE is free software: you can redistribute it
* and/or modify it under the terms of the GNU General Public License * and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 2 of * as published by the Free Software Foundation, either version 2 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* RYZOM CORE PIPELINE is distributed in the hope that it will be * RYZOM CORE PIPELINE is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RYZOM CORE PIPELINE; see the file COPYING. If not, see * along with RYZOM CORE PIPELINE; see the file COPYING. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
@ -51,17 +51,17 @@ namespace PIPELINE {
// ****************************************************************** // ******************************************************************
class CPipelinePluginMaxNelLibrary : public NLMISC::INelLibrary class CPipelinePluginMaxNelLibrary : public NLMISC::INelLibrary
{ {
void onLibraryLoaded(bool /* firstTime */) void onLibraryLoaded(bool /* firstTime */)
{ {
nldebug("Library loaded: CPipelinePluginMax"); nldebug("Library loaded: CPipelinePluginMax");
PIPELINE_REGISTER_CLASS(CProcessMaxShape); PIPELINE_REGISTER_CLASS(CProcessMaxShape);
} }
void onLibraryUnloaded(bool /* lastTime */) void onLibraryUnloaded(bool /* lastTime */)
{ {
nldebug("Library unloaded: CPipelinePluginMax"); nldebug("Library unloaded: CPipelinePluginMax");
} }
}; };
NLMISC_DECL_PURE_LIB(CPipelinePluginMaxNelLibrary) NLMISC_DECL_PURE_LIB(CPipelinePluginMaxNelLibrary)
@ -78,12 +78,12 @@ BOOL WINAPI DllMain(HANDLE hModule, DWORD /* ul_reason_for_call */, LPVOID /* lp
/* /*
CPipelinePluginMax::CPipelinePluginMax() CPipelinePluginMax::CPipelinePluginMax()
{ {
} }
CPipelinePluginMax::~CPipelinePluginMax() CPipelinePluginMax::~CPipelinePluginMax()
{ {
}*/ }*/
namespace { namespace {
@ -134,12 +134,12 @@ std::string standardizePath(const std::string &path, bool addFinalSlash)
return newPath; return newPath;
} }
inline bool isCharacter(char c) inline bool isCharacter(uint8 c)
{ {
return (32 <= c /*&& c <= 127) || (161 <= c*/ && c <= 255); return (32 <= c /*&& c <= 127) || (161 <= c*/ /*&& c <= 255*/);
} }
inline char stripFrenchLocale(char c) inline uint8 stripFrenchLocale(uint8 c)
{ {
if (192 <= c && c <= 197) return 'a'; if (192 <= c && c <= 197) return 'a';
if (200 <= c && c <= 203) return 'e'; if (200 <= c && c <= 203) return 'e';
@ -349,7 +349,7 @@ public:
std::string SrcDirectoryRecursive; std::string SrcDirectoryRecursive;
std::string DatabaseDirectory; std::string DatabaseDirectory;
virtual void getName(std::string &result) const virtual void getName(std::string &result) const
{ result = "CMaxRewritePathsCommand"; } { result = "CMaxRewritePathsCommand"; }
void doFile(const std::string &filePath) void doFile(const std::string &filePath)
@ -383,7 +383,7 @@ public:
{ {
if (!isCharacter(buffer[j])) if (!isCharacter(buffer[j]))
{ {
if (buffer[j + 1] == '\\' && buffer[j + 2] == '\\' || buffer[j] == 0) if ((buffer[j + 1] == '\\' && buffer[j + 2] == '\\') || buffer[j] == 0)
{ {
beginPath = j + 1; beginPath = j + 1;
break; break;
@ -425,19 +425,19 @@ public:
std::vector<std::string> dirContents; std::vector<std::string> dirContents;
NLMISC::CPath::getPathContent(dirPath, false, true, true, dirContents); NLMISC::CPath::getPathContent(dirPath, false, true, true, dirContents);
for (std::vector<std::string>::iterator it = dirContents.begin(), end = dirContents.end(); it != end; ++it) for (std::vector<std::string>::iterator it = dirContents.begin(), end = dirContents.end(); it != end; ++it)
{ {
const std::string &subPath = standardizePath(*it, false); const std::string &subPath = standardizePath(*it, false);
if (NLMISC::CFile::isDirectory(subPath)) if (NLMISC::CFile::isDirectory(subPath))
{ {
if (subPath.find("\\.") == std::string.npos) if (subPath.find("\\.") == std::string::npos)
doDirectory(subPath); doDirectory(subPath);
} }
else else
doFile(subPath); doFile(subPath);
if (PIPELINE::IPipelineInterface::getInstance()->isExiting()) if (PIPELINE::IPipelineInterface::getInstance()->isExiting())
return; return;
} }
@ -466,7 +466,7 @@ public:
std::string SrcDirectoryRecursive; std::string SrcDirectoryRecursive;
std::string DatabaseDirectory; std::string DatabaseDirectory;
virtual void getName(std::string &result) const virtual void getName(std::string &result) const
{ result = "CMaxRewriteInitCacheCommand"; } { result = "CMaxRewriteInitCacheCommand"; }
void doFile(const std::string &filePath) void doFile(const std::string &filePath)
@ -484,19 +484,19 @@ public:
std::vector<std::string> dirContents; std::vector<std::string> dirContents;
NLMISC::CPath::getPathContent(dirPath, false, true, true, dirContents); NLMISC::CPath::getPathContent(dirPath, false, true, true, dirContents);
for (std::vector<std::string>::iterator it = dirContents.begin(), end = dirContents.end(); it != end; ++it) for (std::vector<std::string>::iterator it = dirContents.begin(), end = dirContents.end(); it != end; ++it)
{ {
const std::string &subPath = standardizePath(*it, false); const std::string &subPath = standardizePath(*it, false);
if (NLMISC::CFile::isDirectory(subPath)) if (NLMISC::CFile::isDirectory(subPath))
{ {
if (subPath.find("\\.") == std::string.npos) if (subPath.find("\\.") == std::string::npos)
doDirectory(subPath); doDirectory(subPath);
} }
else else
doFile(subPath); doFile(subPath);
if (PIPELINE::IPipelineInterface::getInstance()->isExiting()) if (PIPELINE::IPipelineInterface::getInstance()->isExiting())
return; return;
} }

@ -6,20 +6,20 @@
* CMetadataStorage * CMetadataStorage
*/ */
/* /*
* Copyright (C) 2012 by authors * Copyright (C) 2012 by authors
* *
* This file is part of RYZOM CORE PIPELINE. * This file is part of RYZOM CORE PIPELINE.
* RYZOM CORE PIPELINE is free software: you can redistribute it * RYZOM CORE PIPELINE is free software: you can redistribute it
* and/or modify it under the terms of the GNU Affero General Public * and/or modify it under the terms of the GNU Affero General Public
* License as published by the Free Software Foundation, either * License as published by the Free Software Foundation, either
* version 3 of the License, or (at your option) any later version. * version 3 of the License, or (at your option) any later version.
* *
* RYZOM CORE PIPELINE is distributed in the hope that it will be * RYZOM CORE PIPELINE is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public * You should have received a copy of the GNU Affero General Public
* License along with RYZOM CORE PIPELINE. If not, see * License along with RYZOM CORE PIPELINE. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
@ -34,7 +34,6 @@
// #include <nel/misc/debug.h> // #include <nel/misc/debug.h>
#include <nel/misc/file.h> #include <nel/misc/file.h>
#include <nel/misc/path.h> #include <nel/misc/path.h>
#include <nel/misc/stream.h>
// Project includes // Project includes

@ -30,17 +30,17 @@
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
// STL includes // STL includes
#include <vector>
// NeL includes // NeL includes
#include <vector>
#include <nel/misc/tool_logger.h> #include <nel/misc/tool_logger.h>
#include <nel/misc/stream.h>
// Project includes // Project includes
#include "workspace_storage.h" #include "workspace_storage.h"
namespace NLMISC { namespace NLMISC {
class IStream; class IStream;
struct EStream;
} }
namespace PIPELINE { namespace PIPELINE {

Loading…
Cancel
Save