[mojosetup] [PATCH] Assorted spelling fixes.
Francois Gouget
fgouget at codeweavers.com
Mon May 21 14:45:41 EDT 2012
---
One more totally unrelated patch in case you need a change of pace.
archive_zip.c | 6 +++---
buildver.c | 2 +-
docs.txt | 4 ++--
gui.h | 2 +-
lua_glue.c | 2 +-
misc/FindCurses.cmake | 6 +++---
platform.h | 4 ++--
scripts/mojosetup_mainline.lua | 4 ++--
stb_image.c | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/archive_zip.c b/archive_zip.c
index eddf25f..d3d7dd8 100644
--- a/archive_zip.c
+++ b/archive_zip.c
@@ -990,7 +990,7 @@ static int zip_version_does_symlinks(PHYSFS_uint32 version)
switch (hosttype)
{
/*
- * These are the platforms that can NOT build an archive with
+ * These are the platforms that CANNOT build an archive with
* symlinks, according to the Info-ZIP project.
*/
case 0: /* FS_FAT_ */
@@ -1368,7 +1368,7 @@ static PHYSFS_sint32 zip_find_start_of_dir(ZIPinfo *info, const char *path,
rc = 1;
else
{
- if (stop_on_first_find) /* Just checking dir's existance? */
+ if (stop_on_first_find) /* Just checking dir's existence? */
return(middle);
if (name[dlen + 1] == '\0') /* Skip initial dir entry. */
@@ -1391,7 +1391,7 @@ static PHYSFS_sint32 zip_find_start_of_dir(ZIPinfo *info, const char *path,
/*
- * Moved to seperate function so we can use alloca then immediately throw
+ * Moved to separate function so we can use alloca then immediately throw
* away the allocated stack space...
*/
static void doEnumCallback(PHYSFS_EnumFilesCallback cb, void *callbackdata,
diff --git a/buildver.c b/buildver.c
index cd14aaa..1990c53 100644
--- a/buildver.c
+++ b/buildver.c
@@ -12,7 +12,7 @@
* have to rebuild...this file's checksum changes every time you build it
* due to the __DATE__ and __TIME__ macros.
*
- * The makefile will rebuild this file everytime it relinks an executable
+ * The makefile will rebuild this file every time it relinks an executable
* so that we'll always have a unique build string.
*
* APPNAME and APPREV need to be predefined in the build system.
diff --git a/docs.txt b/docs.txt
index 9e51a6c..f66d421 100644
--- a/docs.txt
+++ b/docs.txt
@@ -908,7 +908,7 @@ Here are the elements, and the attributes they can possess.
Setup.DesktopMenuItem:
This element specifies a menu item that will be installed in the system
- desktop menu: this might be the "Applications" dropdown in the Gnome panel,
+ desktop menu: this might be the "Applications" dropdown in the GNOME panel,
or the "Start" bar on Windows, for example. This can be a child of
Setup.Option (in which case it is only considered for installation if the
option itself is too), or Setup.Package (in which case it is always
@@ -1212,7 +1212,7 @@ Your config file is a Lua script, and as such, has access to all of Lua's
either a "YES", "NO", "ALWAYS" or "NEVER" button. Returns the string
"yes", "no", "always", or "never". (title) is the message box's title.
(defval) is an optional boolean value: whether the default action should
- be "YES" or "NO" ... "always" and "never" can not be the default, since
+ be "YES" or "NO" ... "always" and "never" cannot be the default, since
these tend to be destructive actions that the user should consciously
choose to do. If (defval) isn't specified, it defaults to false.
diff --git a/gui.h b/gui.h
index 8883010..0f10d5d 100644
--- a/gui.h
+++ b/gui.h
@@ -293,7 +293,7 @@ const MojoGui *MojoGuiPlugin_gtkplus2(int rev, const MojoSetupEntryPoints *e);
const MojoGui *MojoGuiPlugin_www(int rev, const MojoSetupEntryPoints *e);
const MojoGui *MojoGuiPlugin_cocoa(int rev, const MojoSetupEntryPoints *e);
-// !!! FIXME: Qt? KDE? Gnome? Console? wxWidgets?
+// !!! FIXME: Qt? KDE? GNOME? Console? wxWidgets?
#ifdef __cplusplus
}
diff --git a/lua_glue.c b/lua_glue.c
index 3f77aac..c59c7f3 100644
--- a/lua_glue.c
+++ b/lua_glue.c
@@ -568,7 +568,7 @@ static int luahook_format(lua_State *L)
// Use this instead of Lua's error() function if you don't have a
-// programatic error, so you don't get stack callback stuff:
+// programmatic error, so you don't get stack callback stuff:
// MojoSetup.fatal("You need the base game to install this expansion pack.")
// This will also handle cleanup of half-written installations.
// Doesn't actually return.
diff --git a/misc/FindCurses.cmake b/misc/FindCurses.cmake
index 3107d75..c4b463c 100644
--- a/misc/FindCurses.cmake
+++ b/misc/FindCurses.cmake
@@ -71,7 +71,7 @@ IF(NOT CURSES_USE_NCURSES)
GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH)
# for compatibility with older FindCurses.cmake this has to be in the cache
- # FORCE must not be used since this would break builds which preload a cache wqith these variables set
+ # FORCE must not be used since this would break builds which preload a cache with these variables set
SET(CURSES_INCLUDE_PATH "${CURSES_CURSES_H_PATH} ${CURSES_CURSESW_H_PATH}"
CACHE FILEPATH "The curses include path")
SET(CURSES_LIBRARY "${CURSES_CURSES_LIBRARY}"
@@ -100,7 +100,7 @@ ELSE(NOT CURSES_USE_NCURSES)
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload
- # a cache wqith these variables set
+ # a cache with these variables set
# only put ncurses include and library into
# variables if they are found
IF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
@@ -129,7 +129,7 @@ FIND_LIBRARY(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" )
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache
-# qith these variables set
+# with these variables set
SET(FORM_LIBRARY "${CURSES_FORM_LIBRARY}"
CACHE FILEPATH "The curses form library")
diff --git a/platform.h b/platform.h
index 99d597a..3a089e5 100644
--- a/platform.h
+++ b/platform.h
@@ -68,7 +68,7 @@ boolean MojoPlatform_rename(const char *src, const char *dst);
// Determine if dir/fname exists in the native filesystem. It doesn't matter
// if it's a directory, file, symlink, etc, we're just looking for the
-// existance of the entry itself. (fname) may be NULL, in which case,
+// existence of the entry itself. (fname) may be NULL, in which case,
// (dir) contains the whole path, otherwise, the platform layer needs to
// build the path: (on Unix: dir/path, on Windows: dir\\path, etc).
// This is a convenience thing for the caller.
@@ -271,7 +271,7 @@ boolean MojoPlatform_spawnTerminal(void);
// for input, etc. Pumping the GUI event queue happens elsewhere, not here.
void MojoPlatform_sleep(uint32 ticks);
-// Put a line of text to the the system log, whatever that might be on a
+// Put a line of text to the system log, whatever that might be on a
// given platform. (str) is a complete line, but won't end with any newline
// characters. You should supply if needed.
void MojoPlatform_log(const char *str);
diff --git a/scripts/mojosetup_mainline.lua b/scripts/mojosetup_mainline.lua
index cde5ba9..1999069 100644
--- a/scripts/mojosetup_mainline.lua
+++ b/scripts/mojosetup_mainline.lua
@@ -982,7 +982,7 @@ end
local function install_control_app(desc, key)
local dst, src
- -- We copy the installer binary itself, and any auxillary files it needs,
+ -- We copy the installer binary itself, and any auxiliary files it needs,
-- like this Lua script, to a metadata directory in the installation.
-- Unfortunately, the binary might be a self-extracting installer that
-- has gigabytes of now-unnecessary data appended to it, so we need to
@@ -1241,7 +1241,7 @@ local function get_productkey(thisstage, maxstage, desc, fmt, verify, dest, mani
local retval = nil
-- Retrieve the previous entry, in case we're stepping back over a stage.
- -- This lets the user edit it or jsut move forward without typing the
+ -- This lets the user edit it or just move forward without typing the
-- whole thing again.
if MojoSetup.productkeys[desc] ~= nil then
userkey = MojoSetup.productkeys[desc].user_productkey
diff --git a/stb_image.c b/stb_image.c
index 067eaac..7f6f4b5 100644
--- a/stb_image.c
+++ b/stb_image.c
@@ -3370,7 +3370,7 @@ static stbi_uc *psd_load(int *x, int *y, int *comp, int req_comp)
// Else if n is 128, noop.
// Endloop
- // The RLE-compressed data is preceeded by a 2-byte data count for each row in the data,
+ // The RLE-compressed data is preceded by a 2-byte data count for each row in the data,
// which we're going to just skip.
skip( h * channelCount * 2 );
--
1.7.10
More information about the mojosetup
mailing list