From d0cdc687353cbba0ab844a360a23c71945c8370b Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Mon, 6 May 2013 10:29:55 -0400 Subject: KWSys 2013-05-06 (f4928d44) Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ f4928d44 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 709fb5c1..f4928d44 Andreas Mohr (1): f4928d44 Fix spelling and typos in comments and method documentation Change-Id: I64109c176370a9f10a22da21bc81bd9306a80431 --- CommandLineArguments.hxx.in | 10 +++++----- SharedForward.h.in | 2 +- SystemInformation.hxx.in | 4 ++-- SystemTools.cxx | 2 +- SystemTools.hxx.in | 2 +- testDynamicLoader.cxx | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CommandLineArguments.hxx.in b/CommandLineArguments.hxx.in index 68e9600..cbf6ee3 100644 --- a/CommandLineArguments.hxx.in +++ b/CommandLineArguments.hxx.in @@ -44,7 +44,7 @@ struct CommandLineArgumentsCallbackStructure; * * For the variable interface you associate variable with each argument. When * the argument is specified, the variable is set to the specified value casted - * to the apropriate type. For boolean (NO_ARGUMENT), the value is "1". + * to the appropriate type. For boolean (NO_ARGUMENT), the value is "1". * * Both interfaces can be used at the same time. * @@ -99,7 +99,7 @@ public: STRING_TYPE, // The variable is string (char*) STL_STRING_TYPE, // The variable is string (char*) VECTOR_INT_TYPE, // The variable is integer (int) - VECTOR_BOOL_TYPE, // The vairable is boolean (bool) + VECTOR_BOOL_TYPE, // The variable is boolean (bool) VECTOR_DOUBLE_TYPE, // The variable is float (double) VECTOR_STRING_TYPE, // The variable is string (char*) VECTOR_STL_STRING_TYPE, // The variable is string (char*) @@ -128,7 +128,7 @@ public: void ProcessArgument(const char* arg); /** - * This method will parse arguments and call apropriate methods. + * This method will parse arguments and call appropriate methods. */ int Parse(); @@ -144,7 +144,7 @@ public: /** * Add handler for argument which is going to set the variable to the * specified value. If the argument is specified, the option is casted to the - * apropriate type. + * appropriate type. */ void AddArgument(const char* argument, ArgumentTypeEnum type, bool* variable, const char* help); @@ -160,7 +160,7 @@ public: /** * Add handler for argument which is going to set the variable to the * specified value. If the argument is specified, the option is casted to the - * apropriate type. This will handle the multi argument values. + * appropriate type. This will handle the multi argument values. */ void AddArgument(const char* argument, ArgumentTypeEnum type, kwsys_stl::vector* variable, const char* help); diff --git a/SharedForward.h.in b/SharedForward.h.in index 8521099..8bbc74a 100644 --- a/SharedForward.h.in +++ b/SharedForward.h.in @@ -772,7 +772,7 @@ static int kwsys_shared_forward_get_settings(const char* self_path, const char** dir; for(dir = search_path; *dir; ++dir) { - /* Add seperator between path components. */ + /* Add separator between path components. */ if(dir != search_path) { strcat(ldpath, kwsys_shared_forward_path_sep); diff --git a/SystemInformation.hxx.in b/SystemInformation.hxx.in index 8f4cb4e..f7c454e 100644 --- a/SystemInformation.hxx.in +++ b/SystemInformation.hxx.in @@ -117,8 +117,8 @@ public: // Get total system RAM in units of KiB available to this process. // This may differ from the host available if a per-process resource // limit is applied. per-process memory limits are applied on unix - // system via rlimit api. Resource limits that are not imposed via - // rlimit api may be reported to us via an application specified + // system via rlimit API. Resource limits that are not imposed via + // rlimit API may be reported to us via an application specified // environment variable. LongLong GetProcMemoryAvailable( const char *hostLimitEnvVarName=NULL, diff --git a/SystemTools.cxx b/SystemTools.cxx index d816b17..394d65e 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -4002,7 +4002,7 @@ void SystemTools::SplitProgramFromArgs(const char* path, args = dir.substr(spacePos, dir.size()-spacePos); return; } - // Now try and find the the program in the path + // Now try and find the program in the path findProg = SystemTools::FindProgram(tryProg.c_str(), e); if(findProg.size()) { diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in index 9c56e96..e55d431 100644 --- a/SystemTools.hxx.in +++ b/SystemTools.hxx.in @@ -766,7 +766,7 @@ public: static kwsys_stl::string GetCurrentWorkingDirectory(bool collapse =true); /** - * Change directory the the directory specified + * Change directory to the directory specified */ static int ChangeDirectory(const char* dir); diff --git a/testDynamicLoader.cxx b/testDynamicLoader.cxx index 61c1572..dd6d603 100644 --- a/testDynamicLoader.cxx +++ b/testDynamicLoader.cxx @@ -109,9 +109,9 @@ int testDynamicLoader(int argc, char *argv[]) // dlopen() on Syllable before 11/22/2007 doesn't return 0 on error #ifndef __SYLLABLE__ - // Make sure that inexistant lib is giving correct result + // Make sure that inexistent lib is giving correct result res += TestDynamicLoader("azerty_", "foo_bar",0,0,0); - // Make sure that random binary file cannnot be assimilated as dylib + // Make sure that random binary file cannot be assimilated as dylib res += TestDynamicLoader(TEST_SYSTEMTOOLS_BIN_FILE, "wp",0,0,0); #endif -- cgit v0.12