[glib: 1/2] tree: Fix various typos and outdated terminology
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/2] tree: Fix various typos and outdated terminology
- Date: Fri, 12 Jun 2020 16:18:57 +0000 (UTC)
commit 00bfb3ab4479fd3796e5c292fce7088209702d10
Author: Philip Withnall <withnall endlessm com>
Date: Fri Jun 12 14:02:30 2020 +0100
tree: Fix various typos and outdated terminology
This was mostly machine generated with the following command:
```
codespell \
--builtin clear,rare,usage \
--skip './po/*' --skip './.git/*' --skip './NEWS*' \
--write-changes .
```
using the latest git version of `codespell` as per [these
instructions](https://github.com/codespell-project/codespell#user-content-updating).
Then I manually checked each change using `git add -p`, made a few
manual fixups and dropped a load of incorrect changes.
There are still some outdated or loaded terms used in GLib, mostly to do
with git branch terminology. They will need to be changed later as part
of a wider migration of git terminology.
If I’ve missed anything, please file an issue!
Signed-off-by: Philip Withnall <withnall endlessm com>
.gitlab-ci/run-check-todos.sh | 5 +--
.gitlab-ci/run-style-check-diff.sh | 5 +--
README.md | 2 +-
docs/debugging.txt | 4 +--
docs/reference/gio/gdbus-codegen.xml | 2 +-
docs/reference/gio/gio-docs.xml | 2 +-
docs/reference/gio/migrating-gconf.xml | 2 +-
docs/reference/gio/overview.xml | 2 +-
docs/reference/glib/changes.xml | 2 +-
docs/reference/glib/gvariant-text.xml | 10 +++---
docs/reference/glib/gvariant-varargs.xml | 2 +-
docs/reference/glib/regex-syntax.xml | 2 +-
docs/reference/glib/running.xml | 2 +-
gio/completion/gio | 2 +-
gio/gapplication.c | 2 +-
gio/gasynchelper.c | 2 +-
gio/gconverteroutputstream.c | 2 +-
gio/gdbus-2.0/codegen/codegen.py | 4 +--
gio/gdbusmessage.c | 4 +--
gio/gdbusobjectmanagerclient.c | 4 +--
gio/gdbusprivate.c | 2 +-
gio/gdesktopappinfo.c | 56 ++++++++++++++++----------------
gio/gdrive.c | 6 ++--
gio/gdrive.h | 2 +-
gio/gfileattribute.c | 2 +-
gio/gfileinfo.c | 4 +--
gio/gfileinfo.h | 2 +-
gio/gfilenamecompleter.c | 2 +-
gio/ginitable.c | 2 +-
gio/gioenums.h | 2 +-
gio/giomodule.c | 4 +--
gio/giostream.c | 2 +-
gio/giotypes.h | 2 +-
gio/glistmodel.c | 2 +-
gio/gmenumodel.c | 2 +-
gio/gmountoperation.c | 2 +-
gio/gnetworkservice.c | 2 +-
gio/gosxappinfo.m | 2 +-
gio/goutputstream.c | 2 +-
gio/gproxyaddress.c | 2 +-
gio/gregistrysettingsbackend.c | 2 +-
gio/gseekable.c | 2 +-
gio/gsocket.c | 4 +--
gio/gsocketservice.h | 2 +-
gio/gsocks5proxy.c | 2 +-
gio/gtask.c | 2 +-
gio/gtcpwrapperconnection.c | 2 +-
gio/gthreadedresolver.c | 6 ++--
gio/gunionvolumemonitor.c | 2 +-
gio/gunixmounts.c | 2 +-
gio/gwin32registrykey.c | 2 +-
gio/gwin32volumemonitor.c | 4 +--
gio/kqueue/dep-list.c | 6 ++--
gio/kqueue/gkqueuefilemonitor.c | 2 +-
gio/org.freedesktop.portal.Documents.xml | 2 +-
gio/tests/gdbus-addresses.c | 2 +-
gio/tests/gdbus-export.c | 2 +-
gio/tests/gdbus-peer.c | 4 +--
gio/tests/gdbus-proxy-threads.c | 2 +-
gio/tests/gdbus-proxy.c | 2 +-
gio/tests/gdbus-test-codegen.c | 2 +-
gio/tests/gdbus-threading.c | 2 +-
gio/tests/gsubprocess.c | 4 +--
gio/tests/gtlsconsoleinteraction.c | 2 +-
gio/tests/live-g-file.txt | 2 +-
gio/tests/resourceplugin.c | 2 +-
gio/tests/resources.c | 2 +-
gio/tests/socket-service.c | 2 +-
gio/tests/test2.gresource.xml | 2 +-
gio/tests/tls-certificate.c | 2 +-
gio/win32/gwin32fsmonitorutils.c | 2 +-
glib-gettextize.in | 2 +-
glib/deprecated/gmain.h | 2 +-
glib/deprecated/gthread-deprecated.c | 12 +++----
glib/garcbox.c | 4 +--
glib/gbitlock.c | 2 +-
glib/gen-unicode-tables.pl | 4 +--
glib/genviron.c | 2 +-
glib/ggettext.c | 2 +-
glib/ghash.c | 2 +-
glib/giochannel.c | 8 ++---
glib/gkeyfile.c | 4 +--
glib/gmacros.h | 2 +-
glib/gmessages.c | 2 +-
glib/gnode.c | 2 +-
glib/grand.c | 2 +-
glib/grand.h | 2 +-
glib/gregex.c | 6 ++--
glib/gslice.c | 6 ++--
glib/gspawn-win32-helper.c | 10 +++---
glib/gspawn-win32.c | 10 +++---
glib/gspawn.h | 2 +-
glib/gstrfuncs.c | 2 +-
glib/gtester-report.in | 2 +-
glib/gthread-win32.c | 4 +--
glib/gtimezone.c | 2 +-
glib/guniprop.c | 6 ++--
glib/gutf8.c | 2 +-
glib/gvariant-core.c | 2 +-
glib/gvariant.c | 2 +-
glib/gvarianttypeinfo.h | 2 +-
glib/gwin32.c | 4 +--
glib/tests/1bit-mutex.c | 2 +-
glib/tests/bytes.c | 4 +--
glib/tests/fileutils.c | 2 +-
glib/tests/option-argv0.c | 2 +-
glib/tests/test-printf.c | 2 +-
glib/tests/win32.c | 8 ++---
glib/update-pcre/update.sh | 2 +-
gmodule/gmodule-dl.c | 2 +-
gmodule/gmodule.c | 4 +--
gmodule/gmodule.h | 2 +-
gobject/gclosure.c | 4 +--
gobject/gclosure.h | 2 +-
gobject/gobject.c | 6 ++--
gobject/gobject.h | 6 ++--
gobject/gparam.c | 2 +-
gobject/gparamspecs.h | 2 +-
gobject/gsignal.c | 4 +--
gobject/gtype.c | 8 ++---
gobject/gvaluecollector.h | 2 +-
gobject/tests/dynamictests.c | 2 +-
gobject/tests/ifaceproperties.c | 2 +-
gobject/tests/properties.c | 46 +++++++++++++-------------
gobject/tests/threadtests.c | 2 +-
m4macros/glib-2.0.m4 | 24 +++++++-------
tests/gobject/performance-threaded.c | 2 +-
tests/gobject/performance.c | 2 +-
128 files changed, 253 insertions(+), 251 deletions(-)
---
diff --git a/.gitlab-ci/run-check-todos.sh b/.gitlab-ci/run-check-todos.sh
index 97a2ff7d6..8af102739 100755
--- a/.gitlab-ci/run-check-todos.sh
+++ b/.gitlab-ci/run-check-todos.sh
@@ -2,8 +2,9 @@
set -e
-# We need to add a new remote for the upstream master, since this script could
-# be running in a personal fork of the repository which has out of date branches.
+# We need to add a new remote for the upstream target branch, since this script
+# could be running in a personal fork of the repository which has out of date
+# branches.
git remote add upstream https://gitlab.gnome.org/GNOME/glib.git
git fetch upstream
diff --git a/.gitlab-ci/run-style-check-diff.sh b/.gitlab-ci/run-style-check-diff.sh
index 534698dc4..1f7b8c125 100755
--- a/.gitlab-ci/run-style-check-diff.sh
+++ b/.gitlab-ci/run-style-check-diff.sh
@@ -5,8 +5,9 @@ set -e
# Wrap everything in a subshell so we can propagate the exit status.
(
-# We need to add a new remote for the upstream master, since this script could
-# be running in a personal fork of the repository which has out of date branches.
+# We need to add a new remote for the upstream target branch, since this script
+# could be running in a personal fork of the repository which has out of date
+# branches.
git remote add upstream https://gitlab.gnome.org/GNOME/glib.git
git fetch upstream
diff --git a/README.md b/README.md
index 6cdd66cf5..4bc4113ce 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ In the bug report please include:
As a last resort, you can also provide a pointer to a larger piece
of software that can be downloaded.
* If the bug was a crash, the exact text that was printed out
- when the crash occured.
+ when the crash occurred.
* Further information such as stack traces may be useful, but
is not necessary.
diff --git a/docs/debugging.txt b/docs/debugging.txt
index 8bd6e3124..2cc600aa9 100644
--- a/docs/debugging.txt
+++ b/docs/debugging.txt
@@ -1,6 +1,6 @@
-Traps (G_BREAKPOINT) and traces for the debuging
-================================================
+Traps (G_BREAKPOINT) and traces for the debugging
+=================================================
Some code portions contain trap variables that can be set during
debugging time if G_ENABLE_DEBUG has been defined upon compilation
diff --git a/docs/reference/gio/gdbus-codegen.xml b/docs/reference/gio/gdbus-codegen.xml
index 155baf7a1..25210c3c4 100644
--- a/docs/reference/gio/gdbus-codegen.xml
+++ b/docs/reference/gio/gdbus-codegen.xml
@@ -952,7 +952,7 @@ my_app_frobber_proxy_new_sync (GDBusConnection *connection,
the <function>net.Corp.MyApp.Frobber.HelloWorld()</function>
D-Bus method, connect to the
<function>::notification</function> GObject signal to receive
- the <function>net.Corp.MyApp.Frobber::Notication</function>
+ the <function>net.Corp.MyApp.Frobber::Notification</function>
D-Bus signal and get/set the
<parameter>net.Corp.MyApp.Frobber:Verbose</parameter> D-Bus
Property using either the GObject property
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
index 3bd552728..565c20c71 100644
--- a/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@ -133,7 +133,7 @@
<xi:include href="xml/gnetworking.xml"/>
</chapter>
<chapter id="highlevel-socket">
- <title>High-level network functionallity</title>
+ <title>High-level network functionality</title>
<xi:include href="xml/gsocketclient.xml"/>
<xi:include href="xml/gsocketconnection.xml"/>
<xi:include href="xml/gunixconnection.xml"/>
diff --git a/docs/reference/gio/migrating-gconf.xml b/docs/reference/gio/migrating-gconf.xml
index 12176a6d7..d9fd06424 100644
--- a/docs/reference/gio/migrating-gconf.xml
+++ b/docs/reference/gio/migrating-gconf.xml
@@ -161,7 +161,7 @@
have a GConf schema. GConf comes with a commandline tool
gsettings-schema-convert that can help with the task of converting
a GConf schema into an equivalent GSettings schema. The tool is not
- perfect and may need assistence in some cases.
+ perfect and may need assistance in some cases.
</para>
<example><title>An example for using gsettings-schema-convert</title>
<para>Running <userinput>gsettings-schema-convert --gconf --xml --schema-id
"org.gnome.font-rendering" --output org.gnome.font-rendering.gschema.xml
destop_gnome_font_rendering.schemas</userinput> on the following
<filename>desktop_gnome_font_rendering.schemas</filename> file:
diff --git a/docs/reference/gio/overview.xml b/docs/reference/gio/overview.xml
index 9d013267e..7817ab60f 100644
--- a/docs/reference/gio/overview.xml
+++ b/docs/reference/gio/overview.xml
@@ -281,7 +281,7 @@ be careful. GIO has extension points whose implementations get loaded
from modules (executable code in shared objects), which could allow
an attacker to sneak his own code into your application by tricking it
into loading the code as a module. However, GIO will never load modules
-from your home directory except when explictly asked to do so via an
+from your home directory except when explicitly asked to do so via an
environment variable.
</para>
diff --git a/docs/reference/glib/changes.xml b/docs/reference/glib/changes.xml
index 24d6bcdb2..9b4aa74ce 100644
--- a/docs/reference/glib/changes.xml
+++ b/docs/reference/glib/changes.xml
@@ -12,7 +12,7 @@
<refnamediv>
<refname>Changes to GLib</refname>
<refpurpose>
-Incompatible changes made between successing versions of GLib
+Incompatible changes made between successive versions of GLib
</refpurpose>
</refnamediv>
diff --git a/docs/reference/glib/gvariant-text.xml b/docs/reference/glib/gvariant-text.xml
index 7a61c19da..55d476e39 100644
--- a/docs/reference/glib/gvariant-text.xml
+++ b/docs/reference/glib/gvariant-text.xml
@@ -288,7 +288,7 @@
</para>
<para>
Unicode escapes of the form <literal>\uxxxx</literal> and <literal>\Uxxxxxxxx</literal> are supported, in
- hexidecimal. The usual control sequence escapes <literal>\a</literal>, <literal>\b</literal>,
+ hexadecimal. The usual control sequence escapes <literal>\a</literal>, <literal>\b</literal>,
<literal>\f</literal>, <literal>\n</literal>, <literal>\r</literal>, <literal>\t</literal> and
<literal>\v</literal> are supported. Additionally, a <literal>\</literal> before a newline character
causes
the newline to be ignored. Finally, any other character following <literal>\</literal> is copied
literally
@@ -296,7 +296,7 @@
additions you should only use this feature when necessary for escaping backslashes or quotes.
</para>
<para>
- The usual octal and hexidecimal escapes <literal>\0nnn</literal> and <literal>\xnn</literal> are not
+ The usual octal and hexadecimal escapes <literal>\0nnn</literal> and <literal>\xnn</literal> are not
supported here. Those escapes are used to encode byte values and GVariant strings are Unicode.
</para>
<para>
@@ -309,10 +309,10 @@
<para>
Numbers are given by default as decimal values. Octal and hex values can be given in the usual way (by
prefixing with <literal>0</literal> or <literal>0x</literal>). Note that GVariant considers bytes to be
- unsigned integers and will print them as a two digit hexidecimal number by default.
+ unsigned integers and will print them as a two digit hexadecimal number by default.
</para>
<para>
- Floating point numbers can also be given in the usual ways, including scientific and hexidecimal
notations.
+ Floating point numbers can also be given in the usual ways, including scientific and hexadecimal
notations.
</para>
<para>
For lack of additional information, integers will be parsed as int32 values by default. If the number
has a
@@ -575,7 +575,7 @@
<para>
Bytestrings support the full range of escapes that you would expect (ie: those supported by
<link linkend='g-strcompress'><function>g_strcompress()</function></link>. This includes the normal
control
- sequence escapes (as mentioned in the section on strings) as well as octal and hexidecimal escapes of the
+ sequence escapes (as mentioned in the section on strings) as well as octal and hexadecimal escapes of the
forms <literal>\0nnn</literal> and <literal>\xnn</literal>.
</para>
<para>
diff --git a/docs/reference/glib/gvariant-varargs.xml b/docs/reference/glib/gvariant-varargs.xml
index b60ab2a34..8529a28aa 100644
--- a/docs/reference/glib/gvariant-varargs.xml
+++ b/docs/reference/glib/gvariant-varargs.xml
@@ -690,7 +690,7 @@ g_variant_unref (value);]]></programlisting></informalexample>
<link linkend='g-variant-get'><function>g_variant_get()</function></link> returns (by reference) a
non-<link linkend='NULL:CAPS'><literal>NULL</literal></link> pointer. When any of these format strings
are
prefixed with an '<literal>m</literal>', the type of arguments that are collected does not change in any
way, but
- <link linkend='NULL:CAPS'><literal>NULL</literal></link> becomes a permissable value, to indicate the
Nothing case.
+ <link linkend='NULL:CAPS'><literal>NULL</literal></link> becomes a permissible value, to indicate the
Nothing case.
</para>
<para>
Note that the "special exception" introduced in the array section for constructing empty arrays is
ignored
diff --git a/docs/reference/glib/regex-syntax.xml b/docs/reference/glib/regex-syntax.xml
index 4cff1796b..5dd92917a 100644
--- a/docs/reference/glib/regex-syntax.xml
+++ b/docs/reference/glib/regex-syntax.xml
@@ -2313,7 +2313,7 @@ refer to them instead of the whole pattern. In a larger pattern, keeping
track of parenthesis numbers can be tricky. It may be more convenient to
use named parentheses instead.
The Perl syntax for this is (?&name); GRegex also supports the(?P>name)
-syntac. We could rewrite the above example as follows:
+syntax. We could rewrite the above example as follows:
</para>
<programlisting>
diff --git a/docs/reference/glib/running.xml b/docs/reference/glib/running.xml
index 989f5b41b..aaafddf1d 100644
--- a/docs/reference/glib/running.xml
+++ b/docs/reference/glib/running.xml
@@ -311,7 +311,7 @@ How to run and debug your GLib application
<ulink url="https://docs.microsoft.com/en-us/windows/desktop/debug/vectored-exception-handling";>Vectored
Exception Handling</ulink>
on Windows (see <link linkend="G_DEBUGGER"><envar>G_DEBUGGER</envar></link>), allowing GLib to catch more
exceptions. Set this variable to a comma-separated list of
- hexademical exception codes that should additionally be caught.
+ hexadecimal exception codes that should additionally be caught.
</para>
<para>
By default GLib will only catch Access Violation, Stack Overflow and
diff --git a/gio/completion/gio b/gio/completion/gio
index 63d3a1279..75473d255 100644
--- a/gio/completion/gio
+++ b/gio/completion/gio
@@ -90,7 +90,7 @@ __gio_location() {
if ! __has_common_prefix; then
COMPREPLY=("${mounts[@]} ${names[@]}")
- # Workaround to prevent overwritting suggestions, it adds empty
+ # Workaround to prevent overwriting suggestions, it adds empty
# suggestion, otherwise names with colons will be corrupted
COMPREPLY+=(" ")
diff --git a/gio/gapplication.c b/gio/gapplication.c
index e112ab645..b78fd9ab2 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -2870,7 +2870,7 @@ g_application_unmark_busy (GApplication *application)
* Gets the application's current busy state, as set through
* g_application_mark_busy() or g_application_bind_busy_property().
*
- * Returns: %TRUE if @application is currenty marked as busy
+ * Returns: %TRUE if @application is currently marked as busy
*
* Since: 2.44
*/
diff --git a/gio/gasynchelper.c b/gio/gasynchelper.c
index 41bbb2ad5..8b1883584 100644
--- a/gio/gasynchelper.c
+++ b/gio/gasynchelper.c
@@ -67,7 +67,7 @@ loop:
* current thread and since we're doing only sync operations,
* this is safe.... */
/* CancelIoEx is only Vista+. Since we have only one overlap
- * operaton on this thread, we can just use: */
+ * operation on this thread, we can just use: */
result = CancelIo (hfile);
g_warn_if_fail (result);
}
diff --git a/gio/gconverteroutputstream.c b/gio/gconverteroutputstream.c
index bb3d94a03..c1fa29ee8 100644
--- a/gio/gconverteroutputstream.c
+++ b/gio/gconverteroutputstream.c
@@ -595,7 +595,7 @@ g_converter_output_stream_flush (GOutputStream *stream,
if (!is_closing &&
res == G_CONVERTER_FLUSHED)
{
- /* Should not have retured FLUSHED with input left */
+ /* Should not have returned FLUSHED with input left */
g_assert (buffer_data_size (&priv->output_buffer) == 0);
flushed = TRUE;
}
diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py
index 4cbe57a3d..5234b3807 100644
--- a/gio/gdbus-2.0/codegen/codegen.py
+++ b/gio/gdbus-2.0/codegen/codegen.py
@@ -1847,7 +1847,7 @@ class CodeGenerator:
' *\n'
' * Finishes an operation started with %s_call_%s().\n'
' *\n'
- ' * Returns: (skip): %%TRUE if the call succeded, %%FALSE if @error is set.\n'
+ ' * Returns: (skip): %%TRUE if the call succeeded, %%FALSE if @error is set.\n'
%(i.name_lower, m.name_lower, i.name_lower, m.name_lower), False))
self.write_gtkdoc_deprecated_and_since_and_close(m, self.outfile, 0)
self.outfile.write('gboolean\n'
@@ -1909,7 +1909,7 @@ class CodeGenerator:
' *\n'
' * See %s_call_%s() for the asynchronous version of this method.\n'
' *\n'
- ' * Returns: (skip): %%TRUE if the call succeded, %%FALSE if @error is set.\n'
+ ' * Returns: (skip): %%TRUE if the call succeeded, %%FALSE if @error is set.\n'
%(i.name, m.name, i.name_lower, m.name_lower), False))
self.write_gtkdoc_deprecated_and_since_and_close(m, self.outfile, 0)
self.outfile.write('gboolean\n'
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 4680ee7f4..3b3a013af 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -264,7 +264,7 @@ g_memory_buffer_write (GMemoryBuffer *mbuf,
if (mbuf->pos + count > mbuf->len)
{
- /* At least enought to fit the write, rounded up
+ /* At least enough to fit the write, rounded up
for greater than linear growth.
TODO: This wastes a lot of memory at large buffer sizes.
Figure out a more rational allocation strategy. */
@@ -3378,7 +3378,7 @@ g_dbus_message_to_gerror (GDBusMessage *message,
}
else
{
- /* TOOD: this shouldn't happen - should check this at message serialization
+ /* TODO: this shouldn't happen - should check this at message serialization
* time and disconnect the peer.
*/
g_set_error (error,
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index a9b94f69d..88fcff4fa 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -1164,7 +1164,7 @@ subscribe_signals (GDBusObjectManagerClient *manager,
name_owner,
NULL, /* interface */
NULL, /* member */
- NULL, /* path - TODO: really want wilcard support here */
+ NULL, /* path - TODO: really want wildcard support here */
NULL, /* arg0 */
G_DBUS_SIGNAL_FLAGS_NONE |
G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE,
@@ -1197,7 +1197,7 @@ subscribe_signals (GDBusObjectManagerClient *manager,
name_owner,
NULL, /* interface */
NULL, /* member */
- NULL, /* path - TODO: really want wilcard support here */
+ NULL, /* path - TODO: really want wildcard support here */
NULL, /* arg0 */
G_DBUS_SIGNAL_FLAGS_NONE,
signal_cb,
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 302c30b42..8526f6925 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -1504,7 +1504,7 @@ continue_writing (GDBusWorker *worker)
}
else
{
- /* filters altered the message -> reencode */
+ /* filters altered the message -> re-encode */
error = NULL;
new_blob = g_dbus_message_to_blob (data->message,
&new_blob_size,
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index ecd2d3c47..42458d962 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -416,7 +416,7 @@ const gchar desktop_key_match_category[N_DESKTOP_KEYS] = {
};
/* Common prefix commands to ignore from Exec= lines */
-const char * const exec_key_match_blacklist[] = {
+const char * const exec_key_match_blocklist[] = {
"bash",
"env",
"flatpak",
@@ -771,7 +771,7 @@ desktop_file_dir_unindexed_get_tweaks (DesktopFileDir *dir,
static void
expand_strv (gchar ***strv_ptr,
gchar **to_add,
- gchar * const *blacklist)
+ gchar * const *blocklist)
{
guint strv_len, add_len;
gchar **strv;
@@ -790,10 +790,10 @@ expand_strv (gchar ***strv_ptr,
for (i = 0; to_add[i]; i++)
{
- /* Don't add blacklisted strings */
- if (blacklist)
- for (j = 0; blacklist[j]; j++)
- if (g_str_equal (to_add[i], blacklist[j]))
+ /* Don't add blocklisted strings */
+ if (blocklist)
+ for (j = 0; blocklist[j]; j++)
+ if (g_str_equal (to_add[i], blocklist[j]))
goto no_add;
/* Don't add duplicates already in the list */
@@ -915,7 +915,7 @@ desktop_file_dir_unindexed_read_mimeapps_lists (DesktopFileDir *dir)
dir->mime_tweaks = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, free_mime_tweaks);
- /* We process in order of precedence, using a blacklisting approach to
+ /* We process in order of precedence, using a blocklisting approach to
* avoid recording later instructions that conflict with ones we found
* earlier.
*
@@ -1134,8 +1134,8 @@ desktop_file_dir_unindexed_setup_search (DesktopFileDir *dir)
if ((slash = strrchr (raw, '/')))
value = slash + 1;
- /* Don't match on blacklisted binaries like interpreters */
- if (g_strv_contains (exec_key_match_blacklist, value))
+ /* Don't match on blocklisted binaries like interpreters */
+ if (g_strv_contains (exec_key_match_blocklist, value))
value = NULL;
}
@@ -1199,7 +1199,7 @@ static void
desktop_file_dir_unindexed_mime_lookup (DesktopFileDir *dir,
const gchar *mime_type,
GPtrArray *hits,
- GPtrArray *blacklist)
+ GPtrArray *blocklist)
{
UnindexedMimeTweaks *tweaks;
gint i;
@@ -1216,7 +1216,7 @@ desktop_file_dir_unindexed_mime_lookup (DesktopFileDir *dir,
gchar *app_name = tweaks->additions[i];
if (!desktop_file_dir_app_name_is_masked (dir, app_name) &&
- !array_contains (blacklist, app_name) && !array_contains (hits, app_name))
+ !array_contains (blocklist, app_name) && !array_contains (hits, app_name))
g_ptr_array_add (hits, app_name);
}
}
@@ -1228,8 +1228,8 @@ desktop_file_dir_unindexed_mime_lookup (DesktopFileDir *dir,
gchar *app_name = tweaks->removals[i];
if (!desktop_file_dir_app_name_is_masked (dir, app_name) &&
- !array_contains (blacklist, app_name) && !array_contains (hits, app_name))
- g_ptr_array_add (blacklist, app_name);
+ !array_contains (blocklist, app_name) && !array_contains (hits, app_name))
+ g_ptr_array_add (blocklist, app_name);
}
}
}
@@ -1447,14 +1447,14 @@ desktop_file_dir_get_all (DesktopFileDir *dir,
* @dir: a #DesktopFileDir
* @mime_type: the mime type to look up
* @hits: the array to store the hits
- * @blacklist: the array to store the blacklist
+ * @blocklist: the array to store the blocklist
*
* Does a lookup of a mimetype against one desktop file directory,
- * recording any hits and blacklisting and "Removed" associations (so
+ * recording any hits and blocklisting and "Removed" associations (so
* later directories don't record them as hits).
*
- * The items added to @hits are duplicated, but the ones in @blacklist
- * are weak pointers. This facilitates simply freeing the blacklist
+ * The items added to @hits are duplicated, but the ones in @blocklist
+ * are weak pointers. This facilitates simply freeing the blocklist
* (which is only used for internal bookkeeping) but using the pdata of
* @hits as the result of the operation.
*/
@@ -1462,9 +1462,9 @@ static void
desktop_file_dir_mime_lookup (DesktopFileDir *dir,
const gchar *mime_type,
GPtrArray *hits,
- GPtrArray *blacklist)
+ GPtrArray *blocklist)
{
- desktop_file_dir_unindexed_mime_lookup (dir, mime_type, hits, blacklist);
+ desktop_file_dir_unindexed_mime_lookup (dir, mime_type, hits, blocklist);
}
/*< internal >
@@ -4131,12 +4131,12 @@ static gchar **
g_desktop_app_info_get_desktop_ids_for_content_type (const gchar *content_type,
gboolean include_fallback)
{
- GPtrArray *hits, *blacklist;
+ GPtrArray *hits, *blocklist;
gchar **types;
gint i, j;
hits = g_ptr_array_new ();
- blacklist = g_ptr_array_new ();
+ blocklist = g_ptr_array_new ();
types = get_list_of_mimetypes (content_type, include_fallback);
@@ -4144,7 +4144,7 @@ g_desktop_app_info_get_desktop_ids_for_content_type (const gchar *content_type,
for (i = 0; types[i]; i++)
for (j = 0; j < desktop_file_dirs->len; j++)
- desktop_file_dir_mime_lookup (g_ptr_array_index (desktop_file_dirs, j), types[i], hits, blacklist);
+ desktop_file_dir_mime_lookup (g_ptr_array_index (desktop_file_dirs, j), types[i], hits, blocklist);
/* We will keep the hits past unlocking, so we must dup them */
for (i = 0; i < hits->len; i++)
@@ -4154,7 +4154,7 @@ g_desktop_app_info_get_desktop_ids_for_content_type (const gchar *content_type,
g_ptr_array_add (hits, NULL);
- g_ptr_array_free (blacklist, TRUE);
+ g_ptr_array_free (blocklist, TRUE);
g_strfreev (types);
return (gchar **) g_ptr_array_free (hits, FALSE);
@@ -4327,7 +4327,7 @@ GAppInfo *
g_app_info_get_default_for_type (const char *content_type,
gboolean must_support_uris)
{
- GPtrArray *blacklist;
+ GPtrArray *blocklist;
GPtrArray *results;
GAppInfo *info;
gchar **types;
@@ -4337,7 +4337,7 @@ g_app_info_get_default_for_type (const char *content_type,
types = get_list_of_mimetypes (content_type, TRUE);
- blacklist = g_ptr_array_new ();
+ blocklist = g_ptr_array_new ();
results = g_ptr_array_new ();
info = NULL;
@@ -4351,7 +4351,7 @@ g_app_info_get_default_for_type (const char *content_type,
/* Consider the associations as well... */
for (j = 0; j < desktop_file_dirs->len; j++)
- desktop_file_dir_mime_lookup (g_ptr_array_index (desktop_file_dirs, j), types[i], results,
blacklist);
+ desktop_file_dir_mime_lookup (g_ptr_array_index (desktop_file_dirs, j), types[i], results,
blocklist);
/* (If any), see if one of those apps is installed... */
for (j = 0; j < results->len; j++)
@@ -4373,7 +4373,7 @@ g_app_info_get_default_for_type (const char *content_type,
}
/* Reset the list, ready to try again with the next (parent)
- * mimetype, but keep the blacklist in place.
+ * mimetype, but keep the blocklist in place.
*/
g_ptr_array_set_size (results, 0);
}
@@ -4381,7 +4381,7 @@ g_app_info_get_default_for_type (const char *content_type,
out:
desktop_file_dirs_unlock ();
- g_ptr_array_unref (blacklist);
+ g_ptr_array_unref (blocklist);
g_ptr_array_unref (results);
g_strfreev (types);
diff --git a/gio/gdrive.c b/gio/gdrive.c
index 08f72b23b..32bdae879 100644
--- a/gio/gdrive.c
+++ b/gio/gdrive.c
@@ -45,7 +45,7 @@
*
* If the #GDrive reports that media isn't automatically detected, one
* can poll for media; typically one should not do this periodically
- * as a poll for media operation is potententially expensive and may
+ * as a poll for media operation is potentially expensive and may
* spin up the drive creating noise.
*
* #GDrive supports starting and stopping drives with authentication
@@ -249,9 +249,9 @@ g_drive_get_volumes (GDrive *drive)
* g_drive_is_media_check_automatic:
* @drive: a #GDrive.
*
- * Checks if @drive is capabable of automatically detecting media changes.
+ * Checks if @drive is capable of automatically detecting media changes.
*
- * Returns: %TRUE if the @drive is capabable of automatically detecting
+ * Returns: %TRUE if the @drive is capable of automatically detecting
* media changes, %FALSE otherwise.
**/
gboolean
diff --git a/gio/gdrive.h b/gio/gdrive.h
index ec92071c7..cd9b7212f 100644
--- a/gio/gdrive.h
+++ b/gio/gdrive.h
@@ -57,7 +57,7 @@ G_BEGIN_DECLS
* @is_removable: Returns %TRUE if the #GDrive and/or its media is considered removable by the user. Since
2.50.
* @is_media_removable: Returns %TRUE if the #GDrive supports removal and insertion of media.
* @has_media: Returns %TRUE if the #GDrive has media inserted.
- * @is_media_check_automatic: Returns %TRUE if the #GDrive is capabable of automatically detecting media
changes.
+ * @is_media_check_automatic: Returns %TRUE if the #GDrive is capable of automatically detecting media
changes.
* @can_poll_for_media: Returns %TRUE if the #GDrive is capable of manually polling for media change.
* @can_eject: Returns %TRUE if the #GDrive can eject media.
* @eject: Ejects a #GDrive.
diff --git a/gio/gfileattribute.c b/gio/gfileattribute.c
index 0e4bfc28f..a38ac09d5 100644
--- a/gio/gfileattribute.c
+++ b/gio/gfileattribute.c
@@ -38,7 +38,7 @@
*
* Keys are strings that contain a key namespace and a key name, separated
* by a colon, e.g. "namespace::keyname". Namespaces are included to sort
- * key-value pairs by namespaces for relevance. Keys can be retrived
+ * key-value pairs by namespaces for relevance. Keys can be retrieved
* using wildcards, e.g. "standard::*" will return all of the keys in the
* "standard" namespace.
*
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 3e0ae1beb..c871809cb 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -830,7 +830,7 @@ _g_file_info_get_attribute_value (GFileInfo *info,
* @info: a #GFileInfo.
* @attribute: a file attribute key.
*
- * Gets the value of a attribute, formated as a string.
+ * Gets the value of a attribute, formatted as a string.
* This escapes things as needed to make the string valid
* UTF-8.
*
@@ -2295,7 +2295,7 @@ struct _GFileAttributeMatcher {
GArray *sub_matchers;
- /* Interator */
+ /* Iterator */
guint32 iterator_ns;
gint iterator_pos;
};
diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index d2459517d..e642d31a0 100644
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -157,7 +157,7 @@ typedef struct _GFileInfoClass GFileInfoClass;
*
* A key in the "standard" namespace for getting the description of the file.
* The description is a utf8 string that describes the file, generally containing
- * the filename, but can also contain furter information. Example descriptions
+ * the filename, but can also contain further information. Example descriptions
* could be "filename (on hostname)" for a remote file or "filename (in trash)"
* for a file in the trash. This is useful for instance as the window title
* when displaying a directory or for a bookmarks menu.
diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c
index 5883b8004..bad2c6e7a 100644
--- a/gio/gfilenamecompleter.c
+++ b/gio/gfilenamecompleter.c
@@ -278,7 +278,7 @@ got_enum (GObject *source_object,
g_object_unref (data->completer->basenames_dir);
g_list_free_full (data->completer->basenames, g_free);
- /* Mark uptodate with no basenames */
+ /* Mark up-to-date with no basenames */
data->completer->basenames_dir = g_object_ref (data->dir);
data->completer->basenames = NULL;
data->completer->basenames_are_escaped = data->should_escape;
diff --git a/gio/ginitable.c b/gio/ginitable.c
index f3fd76ffc..1670a43d9 100644
--- a/gio/ginitable.c
+++ b/gio/ginitable.c
@@ -50,7 +50,7 @@
* unreferenced).
*
* For bindings in languages where the native constructor supports
- * exceptions the binding could check for objects implemention %GInitable
+ * exceptions the binding could check for objects implementing %GInitable
* during normal construction and automatically initialize them, throwing
* an exception on failure.
*/
diff --git a/gio/gioenums.h b/gio/gioenums.h
index c426cfe03..cd3654a3c 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -117,7 +117,7 @@ typedef enum {
/**
* GFileAttributeType:
- * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitalized type.
+ * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitialized type.
* @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated UTF8 string.
* @G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: a zero terminated string of non-zero bytes.
* @G_FILE_ATTRIBUTE_TYPE_BOOLEAN: a boolean value.
diff --git a/gio/giomodule.c b/gio/giomodule.c
index c42026092..f49ea3e4d 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -444,7 +444,7 @@ is_valid_module_name (const gchar *basename,
*
* This may not actually load and initialize all the types in each
* module, some modules may be lazily loaded and initialized when
- * an extension point it implementes is used with e.g.
+ * an extension point it implements is used with e.g.
* g_io_extension_point_get_extensions() or
* g_io_extension_point_get_extension_by_name().
*
@@ -586,7 +586,7 @@ g_io_modules_scan_all_in_directory_with_scope (const char *dirname,
*
* This may not actually load and initialize all the types in each
* module, some modules may be lazily loaded and initialized when
- * an extension point it implementes is used with e.g.
+ * an extension point it implements is used with e.g.
* g_io_extension_point_get_extensions() or
* g_io_extension_point_get_extension_by_name().
*
diff --git a/gio/giostream.c b/gio/giostream.c
index 924e39a34..f708e77af 100644
--- a/gio/giostream.c
+++ b/gio/giostream.c
@@ -830,7 +830,7 @@ splice_cancelled_cb (GCancellable *cancellable,
* @callback: (scope async): a #GAsyncReadyCallback.
* @user_data: (closure): user data passed to @callback.
*
- * Asyncronously splice the output stream of @stream1 to the input stream of
+ * Asynchronously splice the output stream of @stream1 to the input stream of
* @stream2, and splice the output stream of @stream2 to the input stream of
* @stream1.
*
diff --git a/gio/giotypes.h b/gio/giotypes.h
index c9ad8dd90..995c9cb15 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -194,7 +194,7 @@ typedef struct _GSocketListener GSocketListener;
/**
* GSocketService:
*
- * A helper class for handling accepting incomming connections in the
+ * A helper class for handling accepting incoming connections in the
* glib mainloop.
*
* Since: 2.22
diff --git a/gio/glistmodel.c b/gio/glistmodel.c
index 0dde9ad1f..eb797caaf 100644
--- a/gio/glistmodel.c
+++ b/gio/glistmodel.c
@@ -73,7 +73,7 @@ G_DEFINE_INTERFACE (GListModel, g_list_model, G_TYPE_OBJECT)
* it are gone.
*
* On the other side, a consumer is expected only to hold references on
- * objects that are currently "user visible", in order to faciliate the
+ * objects that are currently "user visible", in order to facilitate the
* maximum level of laziness in the implementation of the list and to
* reduce the required number of signal connections at a given time.
*
diff --git a/gio/gmenumodel.c b/gio/gmenumodel.c
index 8ca45e098..49a416c35 100644
--- a/gio/gmenumodel.c
+++ b/gio/gmenumodel.c
@@ -429,7 +429,7 @@ g_menu_model_class_init (GMenuModelClass *class)
* @removed: the number of items removed
* @added: the number of items added
*
- * Emitted when a change has occured to the menu.
+ * Emitted when a change has occurred to the menu.
*
* The only changes that can occur to a menu is that items are removed
* or added. Items may not change (except by being removed and added
diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c
index 39762e51d..05fc50674 100644
--- a/gio/gmountoperation.c
+++ b/gio/gmountoperation.c
@@ -431,7 +431,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
/**
* GMountOperation::show-unmount-progress:
* @op: a #GMountOperation:
- * @message: string containing a mesage to display to the user
+ * @message: string containing a message to display to the user
* @time_left: the estimated time left before the operation completes,
* in microseconds, or -1
* @bytes_left: the amount of bytes to be written before the operation
diff --git a/gio/gnetworkservice.c b/gio/gnetworkservice.c
index 40fe3ab0c..92225f137 100644
--- a/gio/gnetworkservice.c
+++ b/gio/gnetworkservice.c
@@ -318,7 +318,7 @@ g_network_service_get_domain (GNetworkService *srv)
* g_network_service_get_scheme:
* @srv: a #GNetworkService
*
- * Get's the URI scheme used to resolve proxies. By default, the service name
+ * Gets the URI scheme used to resolve proxies. By default, the service name
* is used as scheme.
*
* Returns: @srv's scheme name
diff --git a/gio/gosxappinfo.m b/gio/gosxappinfo.m
index 463b2da3c..849d63575 100644
--- a/gio/gosxappinfo.m
+++ b/gio/gosxappinfo.m
@@ -326,7 +326,7 @@ get_bundle_for_id (CFStringRef bundle_id)
CFArrayRef urls = LSCopyApplicationURLsForBundleIdentifier (bundle_id, NULL);
if (urls)
{
- /* TODO: if there's multiple, we should perhaps prefer one thats in $HOME,
+ /* TODO: if there's multiple, we should perhaps prefer one that's in $HOME,
* instead of just always picking the first.
*/
app_url = CFArrayGetValueAtIndex (urls, 0);
diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index 10f9aa732..87b61a4ec 100644
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -2953,7 +2953,7 @@ close_async_thread (GTask *task,
result = class->flush (stream, cancellable, &error);
}
- /* Auto handling of cancelation disabled, and ignore
+ /* Auto handling of cancellation disabled, and ignore
cancellation, since we want to close things anyway, although
possibly in a quick-n-dirty way. At least we never want to leak
open handles */
diff --git a/gio/gproxyaddress.c b/gio/gproxyaddress.c
index 0b78caa91..a02b31faf 100644
--- a/gio/gproxyaddress.c
+++ b/gio/gproxyaddress.c
@@ -233,7 +233,7 @@ g_proxy_address_class_init (GProxyAddressClass *klass)
g_object_class_install_property (gobject_class,
PROP_DESTINATION_PROTOCOL,
g_param_spec_string ("destination-protocol",
- P_("Destionation Protocol"),
+ P_("Destination Protocol"),
P_("The proxy destination protocol"),
NULL,
G_PARAM_READWRITE |
diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c
index b0e295a04..bae066a0a 100644
--- a/gio/gregistrysettingsbackend.c
+++ b/gio/gregistrysettingsbackend.c
@@ -745,7 +745,7 @@ registry_cache_update_node (GNode *cache_node,
}
/* Blocking notifications is a useful optimisation. When a change is made
- * through GSettings we update the cache manually, but a notifcation is
+ * through GSettings we update the cache manually, but a notification is
* triggered as well. This function is also used for nested notifications,
* eg. if /test and /test/foo are watched, and /test/foo/value is changed then
* we will get notified both for /test/foo and /test and it is helpful to block
diff --git a/gio/gseekable.c b/gio/gseekable.c
index 6886683eb..28e815703 100644
--- a/gio/gseekable.c
+++ b/gio/gseekable.c
@@ -168,7 +168,7 @@ g_seekable_can_truncate (GSeekable *seekable)
*
* Sets the length of the stream to @offset. If the stream was previously
* larger than @offset, the extra data is discarded. If the stream was
- * previouly shorter than @offset, it is extended with NUL ('\0') bytes.
+ * previously shorter than @offset, it is extended with NUL ('\0') bytes.
*
* If @cancellable is not %NULL, then the operation can be cancelled by
* triggering the cancellable object from another thread. If the operation
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 82021ed0d..c83427326 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2249,7 +2249,7 @@ g_socket_w32_get_adapter_ipv4_addr (const gchar *name_or_ip)
*/
if_index = if_nametoindex (name_or_ip);
- /* Step 3: Prepare wchar string for friendly name comparision */
+ /* Step 3: Prepare wchar string for friendly name comparison */
if (if_index == 0)
{
size_t if_name_len = strlen (name_or_ip);
@@ -2259,7 +2259,7 @@ g_socket_w32_get_adapter_ipv4_addr (const gchar *name_or_ip)
wchar_name_or_ip = (wchar_t *) g_try_malloc ((if_name_len + 1) * sizeof(wchar_t));
if (wchar_name_or_ip)
mbstowcs (wchar_name_or_ip, name_or_ip, if_name_len + 1);
- /* NOTE: Even if malloc fails here, some comparisions can still be done later... so no exit here! */
+ /* NOTE: Even if malloc fails here, some comparisons can still be done later... so no exit here! */
}
/*
diff --git a/gio/gsocketservice.h b/gio/gsocketservice.h
index f25a1b6b7..4dc1e8f3b 100644
--- a/gio/gsocketservice.h
+++ b/gio/gsocketservice.h
@@ -48,7 +48,7 @@ typedef struct _GSocketServiceClass GSocketServiceClass;
/**
* GSocketServiceClass:
- * @incomming: signal emitted when new connections are accepted
+ * @incoming: signal emitted when new connections are accepted
*
* Class structure for #GSocketService.
*/
diff --git a/gio/gsocks5proxy.c b/gio/gsocks5proxy.c
index a6544df33..09b7fcac2 100644
--- a/gio/gsocks5proxy.c
+++ b/gio/gsocks5proxy.c
@@ -323,7 +323,7 @@ set_connect_msg (guint8 *msg,
* +----+-----+-------+------+----------+----------+
* | 1 | 1 | X'00' | 1 | Variable | 2 |
* +----+-----+-------+------+----------+----------+
- * This reply need to be read by small part to determin size. Buffer
+ * This reply need to be read by small part to determine size. Buffer
* size is determined in function of the biggest part to read.
*
* The parser only requires 4 bytes.
diff --git a/gio/gtask.c b/gio/gtask.c
index 2059e5147..e2877dcd9 100644
--- a/gio/gtask.c
+++ b/gio/gtask.c
@@ -911,7 +911,7 @@ static void g_task_thread_complete (GTask *task);
* g_task_return_error_if_cancelled() and then returned.
*
* This allows you to create a cancellable wrapper around an
- * uninterruptable function. The #GTaskThreadFunc just needs to be
+ * uninterruptible function. The #GTaskThreadFunc just needs to be
* careful that it does not modify any externally-visible state after
* it has been cancelled. To do that, the thread should call
* g_task_set_return_on_cancel() again to (atomically) set
diff --git a/gio/gtcpwrapperconnection.c b/gio/gtcpwrapperconnection.c
index 9c00869da..7c3bf694c 100644
--- a/gio/gtcpwrapperconnection.c
+++ b/gio/gtcpwrapperconnection.c
@@ -188,7 +188,7 @@ g_tcp_wrapper_connection_new (GIOStream *base_io_stream,
* g_tcp_wrapper_connection_get_base_io_stream:
* @conn: a #GTcpWrapperConnection
*
- * Get's @conn's base #GIOStream
+ * Gets @conn's base #GIOStream
*
* Returns: (transfer none): @conn's base #GIOStream
*/
diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
index 7691b9124..3486162e5 100644
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
@@ -398,7 +398,7 @@ typedef struct {
/* fields in third byte */
unsigned qr: 1; /* response flag */
unsigned opcode: 4; /* purpose of message */
- unsigned aa: 1; /* authoritive answer */
+ unsigned aa: 1; /* authoritative answer */
unsigned tc: 1; /* truncated message */
unsigned rd: 1; /* recursion desired */
/* fields in fourth byte */
@@ -412,7 +412,7 @@ typedef struct {
/* fields in third byte */
unsigned rd :1; /* recursion desired */
unsigned tc :1; /* truncated message */
- unsigned aa :1; /* authoritive answer */
+ unsigned aa :1; /* authoritative answer */
unsigned opcode :4; /* purpose of message */
unsigned qr :1; /* response flag */
/* fields in fourth byte */
@@ -508,7 +508,7 @@ typedef enum __ns_type {
ns_t_cert = 37, /* Certification record */
ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */
ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */
- ns_t_sink = 40, /* Kitchen sink (experimentatl) */
+ ns_t_sink = 40, /* Kitchen sink (experimental) */
ns_t_opt = 41, /* EDNS0 option (meta-RR) */
ns_t_apl = 42, /* Address prefix list (RFC 3123) */
ns_t_tkey = 249, /* Transaction key */
diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c
index 93b74e524..c01730375 100644
--- a/gio/gunionvolumemonitor.c
+++ b/gio/gunionvolumemonitor.c
@@ -546,7 +546,7 @@ _g_mount_get_for_mount_path (const gchar *mount_path,
/* TODO: How do we know this succeeded? Keep in mind that the native
* volume monitor may fail (e.g. not being able to connect to
- * hald). Is the get_mount_for_mount_path() method allowed to
+ * udisks). Is the get_mount_for_mount_path() method allowed to
* return NULL? Seems like it is ... probably the method needs
* to take a boolean and write if it succeeds or not.. Messy.
* Very messy.
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 1880d9926..86aa22d66 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -421,7 +421,7 @@ guess_system_internal (const char *mountpoint,
* to not mengle those mounts with the "regular" mounts (i.e. which points to
* the root). But because those mounts usually just duplicate other mounts and
* are completely ignored with mntend-based implementation, let's mark them as
- * system internal. Given the different approches it doesn't mean that all
+ * system internal. Given the different approaches it doesn't mean that all
* mounts which were ignored will be system internal now, but this should work
* in most cases. For more info, see g_unix_mount_get_root_path() annotation,
* comment in mntent-based _g_get_unix_mounts() implementation and the
diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c
index 30343a9eb..a963d6c0d 100644
--- a/gio/gwin32registrykey.c
+++ b/gio/gwin32registrykey.c
@@ -2234,7 +2234,7 @@ MuiRegQueryValueExW (HKEY hKey,
* When calling with value_data == NULL (to get data size without getting
* the data itself) remember that returned size corresponds to possibly
* unterminated string data (if value is some kind of string), because
- * termination cannot be checked and fixed unless the data is retreived
+ * termination cannot be checked and fixed unless the data is retrieved
* too.
*
* When not %NULL, @mui_dll_dirs indicates that `RegLoadMUIStringW()` API
diff --git a/gio/gwin32volumemonitor.c b/gio/gwin32volumemonitor.c
index 512471834..83d6d3260 100644
--- a/gio/gwin32volumemonitor.c
+++ b/gio/gwin32volumemonitor.c
@@ -105,7 +105,7 @@ get_viewable_logical_drives (void)
return viewable_drives;
}
-/* deliver accesible (aka 'mounted') volumes */
+/* deliver accessible (aka 'mounted') volumes */
static GList *
get_mounts (GVolumeMonitor *volume_monitor)
{
@@ -237,7 +237,7 @@ g_win32_volume_monitor_class_init (GWin32VolumeMonitorClass *klass)
static void
g_win32_volume_monitor_init (GWin32VolumeMonitor *win32_monitor)
{
- /* maybe we shoud setup a callback window to listern for WM_DEVICECHANGE ? */
+ /* maybe we should setup a callback window to listen for WM_DEVICECHANGE ? */
#if 0
unix_monitor->mount_monitor = g_win32_mount_monitor_new ();
diff --git a/gio/kqueue/dep-list.c b/gio/kqueue/dep-list.c
index 588cebd80..0a46aa850 100644
--- a/gio/kqueue/dep-list.c
+++ b/gio/kqueue/dep-list.c
@@ -231,7 +231,7 @@ error:
*
* @param[in,out] before A pointer to a pointer to a list. Will contain items
* which were not found in the 'after' list.
- * @param[in,out] after A pointer to a pointer to a list. Will containt items
+ * @param[in,out] after A pointer to a pointer to a list. Will contain items
* which were not found in the 'before' list.
**/
void
@@ -356,7 +356,7 @@ G_STMT_START { \
* Detect and notify about moves in the watched directory.
*
* A move is what happens when you rename a file in a directory, and
- * a new name is unique, i.e. you didnt overwrite any existing files
+ * a new name is unique, i.e. you didn't overwrite any existing files
* with this one.
*
* @param[in,out] removed A list of the removed files in the directory.
@@ -387,7 +387,7 @@ dl_detect_moves (dep_list **removed,
/**
* Detect and notify about replacements in the watched directory.
*
- * Consider you are watching a directory foo with the folloing files
+ * Consider you are watching a directory foo with the following files
* insinde:
*
* foo/bar
diff --git a/gio/kqueue/gkqueuefilemonitor.c b/gio/kqueue/gkqueuefilemonitor.c
index c6e4ec4b8..f69f98e1c 100644
--- a/gio/kqueue/gkqueuefilemonitor.c
+++ b/gio/kqueue/gkqueuefilemonitor.c
@@ -354,7 +354,7 @@ g_kqueue_file_monitor_callback (gint fd, GIOCondition condition, gpointer user_d
* rescan of missing files immediately so we don't have to wait for
* 4 seconds for discovering missing files. We pass the sub_file
* corresponding to the GKqueueFileMonitor to 'check_this_sub_only'
- * argument to prevent _km_scan_missing from emiting 'CREATED'
+ * argument to prevent _km_scan_missing from emitting 'CREATED'
* events because _kh_dir_diff will do it for us. */
if (sub->mon->sub_file != NULL && sub->mon->sub_file->fd == -1)
_km_scan_missing (sub->mon->sub_file);
diff --git a/gio/org.freedesktop.portal.Documents.xml b/gio/org.freedesktop.portal.Documents.xml
index da2863043..786793125 100644
--- a/gio/org.freedesktop.portal.Documents.xml
+++ b/gio/org.freedesktop.portal.Documents.xml
@@ -262,7 +262,7 @@
<!--
List:
@app_id: an application ID, or '' to list all documents
- @docs: a dictonary mapping document IDs to their filesystem path
+ @docs: a dictionary mapping document IDs to their filesystem path
Lists documents in the document store for an application (or for
all applications).
diff --git a/gio/tests/gdbus-addresses.c b/gio/tests/gdbus-addresses.c
index f9b222535..dbff79c3e 100644
--- a/gio/tests/gdbus-addresses.c
+++ b/gio/tests/gdbus-addresses.c
@@ -39,7 +39,7 @@ test_empty_address (void)
g_error_free (error);
}
-/* Test that g_dbus_is_supported_address() returns FALSE for an unparseable
+/* Test that g_dbus_is_supported_address() returns FALSE for an unparsable
* address. */
static void
test_unsupported_address (void)
diff --git a/gio/tests/gdbus-export.c b/gio/tests/gdbus-export.c
index fda654c44..ba5388600 100644
--- a/gio/tests/gdbus-export.c
+++ b/gio/tests/gdbus-export.c
@@ -1279,7 +1279,7 @@ test_object_registration (void)
g_strfreev (nodes);
g_assert_cmpint (count_interfaces (c, "/foo/dyna/dynamicallycreated"), ==, 4);
- /* now check that the object hierarachy is properly generated... yes, it's a bit
+ /* now check that the object hierarchy is properly generated... yes, it's a bit
* perverse that we round-trip to the bus to introspect ourselves ;-)
*/
nodes = get_nodes_at (c, "/");
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
index 7ddfdfc7a..617d7561a 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -1862,7 +1862,7 @@ codegen_test_peer (void)
g_assert (value != NULL);
g_variant_unref (value);
- /* Give the proxies a chance to refresh in the defaul main loop */
+ /* Give the proxies a chance to refresh in the default main loop */
g_timeout_add (100, codegen_quit_mainloop_timeout, NULL);
g_main_loop_run (loop);
@@ -1897,7 +1897,7 @@ codegen_test_peer (void)
g_assert (value != NULL);
g_variant_unref (value);
- /* Give the proxies a chance to refresh in the defaul main loop */
+ /* Give the proxies a chance to refresh in the default main loop */
g_timeout_add (1000, codegen_quit_mainloop_timeout, NULL);
g_main_loop_run (loop);
diff --git a/gio/tests/gdbus-proxy-threads.c b/gio/tests/gdbus-proxy-threads.c
index 75ed21d51..690a9cc0e 100644
--- a/gio/tests/gdbus-proxy-threads.c
+++ b/gio/tests/gdbus-proxy-threads.c
@@ -230,7 +230,7 @@ test_proxy (void)
g_main_loop_unref (loop);
/* TODO: should call session_bus_down() but that requires waiting
- * for all the oustanding method calls to complete...
+ * for all the outstanding method calls to complete...
*/
if (g_test_verbose ())
g_printerr ("\n");
diff --git a/gio/tests/gdbus-proxy.c b/gio/tests/gdbus-proxy.c
index 05b22ea1c..a2160dcca 100644
--- a/gio/tests/gdbus-proxy.c
+++ b/gio/tests/gdbus-proxy.c
@@ -388,7 +388,7 @@ test_proxy_signals_on_emit_signal_cb (GDBusProxy *proxy,
g_assert_cmpstr (g_variant_get_type_string (result), ==, "()");
g_variant_unref (result);
- /* check that the signal was recieved before we got the method result */
+ /* check that the signal was received before we got the method result */
g_assert_cmpuint (strlen (data->s->str), >, 0);
/* break out of the loop */
diff --git a/gio/tests/gdbus-test-codegen.c b/gio/tests/gdbus-test-codegen.c
index 691506f0f..bb1d059ca 100644
--- a/gio/tests/gdbus-test-codegen.c
+++ b/gio/tests/gdbus-test-codegen.c
@@ -2434,7 +2434,7 @@ test_interface_stability (void)
*
* - check that a property with name "Type" is mapped into g-name "type"
* with C accessors get_type_ (to avoid clashing with the GType accessor)
- * and set_type_ (for symmetri)
+ * and set_type_ (for symmetry)
* (see https://bugzilla.gnome.org/show_bug.cgi?id=679473 for details)
*
* - (could add more tests here)
diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
index 2b89fb079..4519fda91 100644
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
@@ -409,7 +409,7 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
guint n, divisor;
/*
- * Check that multiple threads can do calls without interferring with
+ * Check that multiple threads can do calls without interfering with
* each other. We do this by creating three threads that call the
* Sleep() method on the server (which handles it asynchronously, e.g.
* it won't block other requests) with different sleep durations and
diff --git a/gio/tests/gsubprocess.c b/gio/tests/gsubprocess.c
index 400fa00a1..bccf6a308 100644
--- a/gio/tests/gsubprocess.c
+++ b/gio/tests/gsubprocess.c
@@ -1046,7 +1046,7 @@ test_communicate_utf8_async (gconstpointer test_data)
g_object_unref (proc);
}
-/* Test g_subprocess_communicate_utf8_async() can be cancelled correclty. */
+/* Test g_subprocess_communicate_utf8_async() can be cancelled correctly. */
static void
test_communicate_utf8_cancelled_async (gconstpointer test_data)
{
@@ -1721,7 +1721,7 @@ test_launcher_environment (void)
/* unset a variable */
g_subprocess_launcher_unsetenv (launcher, "A");
- /* and set a diffferent one */
+ /* and set a different one */
g_subprocess_launcher_setenv (launcher, "E", "F", TRUE);
args = get_test_subprocess_args ("printenv", "A", "C", "E", NULL);
diff --git a/gio/tests/gtlsconsoleinteraction.c b/gio/tests/gtlsconsoleinteraction.c
index ae734ba60..4a12ea860 100644
--- a/gio/tests/gtlsconsoleinteraction.c
+++ b/gio/tests/gtlsconsoleinteraction.c
@@ -32,7 +32,7 @@
/*
* WARNING: This is not the example you're looking for [slow hand wave]. This
- * is not industrial strength, it's just for testing. It uses embarassing
+ * is not industrial strength, it's just for testing. It uses embarrassing
* functions like getpass() and does lazy things with threads.
*/
diff --git a/gio/tests/live-g-file.txt b/gio/tests/live-g-file.txt
index 95da0e0ad..1873a0531 100644
--- a/gio/tests/live-g-file.txt
+++ b/gio/tests/live-g-file.txt
@@ -3,7 +3,7 @@ Before you start testing it would be good to explain how it works.
The script works in three modes:
1. read-only (no special arguments) - suitable for read-only backends. Just
create the sample structure using the second mode, pack it (tar -p is
- preffered to preserve unix modes) and put it on a reachable place.
+ preferred to preserve unix modes) and put it on a reachable place.
2. create-structure - only creates reference structure for later testing
in read-only mode
3. write mode - full test suite, creates testing structure and performs all
diff --git a/gio/tests/resourceplugin.c b/gio/tests/resourceplugin.c
index 6916c6e16..1f218f26f 100644
--- a/gio/tests/resourceplugin.c
+++ b/gio/tests/resourceplugin.c
@@ -4,7 +4,7 @@
* This must be done before including any GLib headers,
* since GLIB_AVAILABLE_IN_ALL, which is used to mark the
* g_io_module*() symbols, is defined to be _GLIB_EXTERN,
- * which must be overriden to export the symbols.
+ * which must be overridden to export the symbols.
*/
#include "modules/symbol-visibility.h"
#define _GLIB_EXTERN GLIB_TEST_EXPORT_SYMBOL
diff --git a/gio/tests/resources.c b/gio/tests/resources.c
index c44d21485..0749b7d01 100644
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.c
@@ -605,7 +605,7 @@ test_resource_binary_linked (void)
/* Test resource whose xml file starts with more than one digit
* and where no explicit c-name is given
- * Checks if resources are sucessfully registered and
+ * Checks if resources are successfully registered and
* data can be found and read. */
static void
test_resource_digits (void)
diff --git a/gio/tests/socket-service.c b/gio/tests/socket-service.c
index dc8bdec23..f1dd783d1 100644
--- a/gio/tests/socket-service.c
+++ b/gio/tests/socket-service.c
@@ -63,7 +63,7 @@ test_start_stop (void)
saddr = g_inet_socket_address_new (iaddr, 0);
g_object_unref (iaddr);
- /* instanciate with g_object_new so we can pass active = false */
+ /* instantiate with g_object_new so we can pass active = false */
service = g_object_new (G_TYPE_SOCKET_SERVICE, "active", FALSE, NULL);
g_assert_false (g_socket_service_is_active (service));
diff --git a/gio/tests/test2.gresource.xml b/gio/tests/test2.gresource.xml
index 0323b47ec..b6dca2b81 100644
--- a/gio/tests/test2.gresource.xml
+++ b/gio/tests/test2.gresource.xml
@@ -4,7 +4,7 @@
<file>test1.txt</file>
</gresource>
<!-- Test compiling the generated GResource C-code
- that has a resouce entry size over 65536 bytes -->
+ that has a resource entry size over 65536 bytes -->
<gresource prefix="/big_prefix">
<file>gresource-big-test.txt</file>
</gresource>
diff --git a/gio/tests/tls-certificate.c b/gio/tests/tls-certificate.c
index e1ba23737..89e3d1421 100644
--- a/gio/tests/tls-certificate.c
+++ b/gio/tests/tls-certificate.c
@@ -285,7 +285,7 @@ from_files (const Reference *ref)
g_assert_null (cert);
/* Using this method twice with a file containing both private key and
- * certificate as a way to inforce private key presence is a fair use
+ * certificate as a way to enforce private key presence is a fair use
*/
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DIST, "cert-tests", "key-cert.pem",
NULL),
g_test_get_filename (G_TEST_DIST, "cert-tests", "key-cert.pem",
NULL),
diff --git a/gio/win32/gwin32fsmonitorutils.c b/gio/win32/gwin32fsmonitorutils.c
index ff8d1710c..e6b7d1dcd 100644
--- a/gio/win32/gwin32fsmonitorutils.c
+++ b/gio/win32/gwin32fsmonitorutils.c
@@ -416,7 +416,7 @@ g_win32_fs_monitor_close_handle (GWin32FSMonitorPrivate *monitor)
/* This triggers a last callback() with nBytes==0. */
/* Actually I am not so sure about that, it seems to trigger a last
- * callback allright, but the way to recognize that it is the final
+ * callback correctly, but the way to recognize that it is the final
* one is not to check for nBytes==0, I think that was a
* misunderstanding.
*/
diff --git a/glib-gettextize.in b/glib-gettextize.in
index af7052f6f..05ec43c1e 100755
--- a/glib-gettextize.in
+++ b/glib-gettextize.in
@@ -73,7 +73,7 @@ This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
$echo "Written by" "Ulrich Drepper"
exit 0 ;;
- -- ) # Stop option prcessing
+ -- ) # Stop option processing
shift; break ;;
-* )
$echo "glib-gettextize: unknown option $1"
diff --git a/glib/deprecated/gmain.h b/glib/deprecated/gmain.h
index 2199328fd..5d08eb6b4 100644
--- a/glib/deprecated/gmain.h
+++ b/glib/deprecated/gmain.h
@@ -115,7 +115,7 @@ G_BEGIN_DECLS
*
* Returns: %TRUE if any events are pending.
*
- * Deprected: 2.2: Use g_main_context_pending() instead.
+ * Deprecated: 2.2: Use g_main_context_pending() instead.
*/
#define g_main_pending() g_main_context_pending (NULL)
GLIB_DEPRECATED_MACRO_IN_2_26_FOR(g_main_context_pending)
diff --git a/glib/deprecated/gthread-deprecated.c b/glib/deprecated/gthread-deprecated.c
index 8ca255c62..48418177e 100644
--- a/glib/deprecated/gthread-deprecated.c
+++ b/glib/deprecated/gthread-deprecated.c
@@ -424,7 +424,7 @@ g_once_init_enter_impl (volatile gsize *location)
* want to require prior calling to g_thread_init(), because your code
* should also be usable in non-threaded programs, you are not able to
* use g_mutex_new() and thus #GMutex, as that requires a prior call to
- * g_thread_init(). In theses cases you can also use a #GStaticMutex.
+ * g_thread_init(). In these cases you can also use a #GStaticMutex.
* It must be initialized with g_static_mutex_init() before using it
* and freed with with g_static_mutex_free() when not needed anymore to
* free up any allocated resources.
@@ -1025,7 +1025,7 @@ g_static_rw_lock_reader_lock (GStaticRWLock* lock)
*
* Returns: %TRUE, if @lock could be locked for reading
*
- * Deprectated: 2.32: Use g_rw_lock_reader_trylock() instead
+ * Deprecated: 2.32: Use g_rw_lock_reader_trylock() instead
*/
gboolean
g_static_rw_lock_reader_trylock (GStaticRWLock* lock)
@@ -1055,7 +1055,7 @@ g_static_rw_lock_reader_trylock (GStaticRWLock* lock)
* locks for reading have been unlocked, the waiting thread is woken up
* and can lock @lock for writing.
*
- * Deprectated: 2.32: Use g_rw_lock_reader_unlock() instead
+ * Deprecated: 2.32: Use g_rw_lock_reader_unlock() instead
*/
void
g_static_rw_lock_reader_unlock (GStaticRWLock* lock)
@@ -1084,7 +1084,7 @@ g_static_rw_lock_reader_unlock (GStaticRWLock* lock)
* @lock (neither for reading nor writing). This lock has to be
* unlocked by g_static_rw_lock_writer_unlock().
*
- * Deprectated: 2.32: Use g_rw_lock_writer_lock() instead
+ * Deprecated: 2.32: Use g_rw_lock_writer_lock() instead
*/
void
g_static_rw_lock_writer_lock (GStaticRWLock* lock)
@@ -1114,7 +1114,7 @@ g_static_rw_lock_writer_lock (GStaticRWLock* lock)
*
* Returns: %TRUE, if @lock could be locked for writing
*
- * Deprectated: 2.32: Use g_rw_lock_writer_trylock() instead
+ * Deprecated: 2.32: Use g_rw_lock_writer_trylock() instead
*/
gboolean
g_static_rw_lock_writer_trylock (GStaticRWLock* lock)
@@ -1147,7 +1147,7 @@ g_static_rw_lock_writer_trylock (GStaticRWLock* lock)
* lock @lock for reading, the waiting threads are woken up and can
* lock @lock for reading.
*
- * Deprectated: 2.32: Use g_rw_lock_writer_unlock() instead
+ * Deprecated: 2.32: Use g_rw_lock_writer_unlock() instead
*/
void
g_static_rw_lock_writer_unlock (GStaticRWLock* lock)
diff --git a/glib/garcbox.c b/glib/garcbox.c
index 0fa207c3f..70aebb6ed 100644
--- a/glib/garcbox.c
+++ b/glib/garcbox.c
@@ -144,7 +144,7 @@
* If you need to clear the contents of the data, you will need to use an
* ancillary function that calls g_rc_box_release_full():
*
- * |[<!-- laguage="C" -->
+ * |[<!-- language="C" -->
* static void
* my_data_struct_release (MyDataStruct *data)
* {
@@ -188,7 +188,7 @@ g_atomic_rc_box_alloc (gsize block_size)
* @block_size: the size of the allocation, must be greater than 0
*
* Allocates @block_size bytes of memory, and adds atomic
- * referenc counting semantics to it.
+ * reference counting semantics to it.
*
* The contents of the returned data is set to zero.
*
diff --git a/glib/gbitlock.c b/glib/gbitlock.c
index 23024d08c..c08a6f934 100644
--- a/glib/gbitlock.c
+++ b/glib/gbitlock.c
@@ -88,7 +88,7 @@ g_futex_wait (const volatile gint *address,
* Nominally, wakes one thread that is blocked in g_futex_wait() on
* @address (if any thread is currently waiting).
*
- * As mentioned in the documention for g_futex_wait(), spurious
+ * As mentioned in the documentation for g_futex_wait(), spurious
* wakeups may occur. As such, this call may result in more than one
* thread being woken up.
*/
diff --git a/glib/gen-unicode-tables.pl b/glib/gen-unicode-tables.pl
index 5633b04fa..6601126c4 100755
--- a/glib/gen-unicode-tables.pl
+++ b/glib/gen-unicode-tables.pl
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
-# Contributer(s):
+# Contributor(s):
# Andrew Taylor <andrew taylor montage ca>
# gen-unicode-tables.pl - Generate tables for libunicode from Unicode data.
@@ -225,7 +225,7 @@ defined $derivedeastasianwidthtxt or die "Did not find DerivedEastAsianWidth fil
print "Creating decomp table\n" if ($do_decomp);
print "Creating property table\n" if ($do_props);
-print "Composition exlusions from $compositionexclusionstxt\n";
+print "Composition exclusions from $compositionexclusionstxt\n";
open (INPUT, "< $compositionexclusionstxt") || exit 1;
diff --git a/glib/genviron.c b/glib/genviron.c
index 55e1e750e..04e9ab0a0 100644
--- a/glib/genviron.c
+++ b/glib/genviron.c
@@ -227,7 +227,7 @@ g_environ_unsetenv (gchar **envp,
return g_environ_unsetenv_internal (envp, variable, TRUE);
}
-/* UNIX implemention {{{1 */
+/* UNIX implementation {{{1 */
#ifndef G_OS_WIN32
/**
diff --git a/glib/ggettext.c b/glib/ggettext.c
index 385305674..303b9b9b6 100644
--- a/glib/ggettext.c
+++ b/glib/ggettext.c
@@ -121,7 +121,7 @@ ensure_gettext_initialized (void)
* This is an internal function and should only be used by
* the internals of glib (such as libgio).
*
- * Returns: the transation of @str to the current locale
+ * Returns: the translation of @str to the current locale
*/
const gchar *
glib_gettext (const gchar *str)
diff --git a/glib/ghash.c b/glib/ghash.c
index 0f1562a06..4fe2912fb 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -154,7 +154,7 @@
* a more secure hash function when using a GHashTable with keys
* that originate in untrusted data (such as HTTP requests).
* Using g_str_hash() in that situation might make your application
- * vulerable to
+ * vulnerable to
* [Algorithmic Complexity Attacks](https://lwn.net/Articles/474912/).
*
* The key to choosing a good hash is unpredictability. Even
diff --git a/glib/giochannel.c b/glib/giochannel.c
index d16399846..d977b769e 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -135,7 +135,7 @@
* @G_IO_STATUS_EOF: End of file.
* @G_IO_STATUS_AGAIN: Resource temporarily unavailable.
*
- * Stati returned by most of the #GIOFuncs functions.
+ * Statuses returned by most of the #GIOFuncs functions.
**/
/**
@@ -1854,7 +1854,7 @@ read_again:
goto done;
}
break;
- case '\0': /* Embeded null in input */
+ case '\0': /* Embedded null in input */
line_length = nextchar - use_buf->str;
got_term_len = 1;
goto done;
@@ -1986,7 +1986,7 @@ g_io_channel_read_to_end (GIOChannel *channel,
* @buf: (out caller-allocates) (array length=count) (element-type guint8):
* a buffer to read data into
* @count: (in): the size of the buffer. Note that the buffer may not be
- * complelely filled even if there is data in the buffer if the
+ * completely filled even if there is data in the buffer if the
* remaining data is not a complete character.
* @bytes_read: (out) (optional): The number of bytes read. This may be
* zero even on success if count < 6 and the channel's encoding
@@ -2374,7 +2374,7 @@ reconvert:
default:
g_assert_not_reached ();
err = (gsize) -1;
- errnum = 0; /* Don't confunse the compiler */
+ errnum = 0; /* Don't confuse the compiler */
}
}
else
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index dc80ce5d4..8572711f8 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -1113,7 +1113,7 @@ g_key_file_load_from_dirs (GKeyFile *key_file,
* @full_path. If the file could not be loaded then an %error is
* set to either a #GFileError or #GKeyFileError.
*
- * Returns: %TRUE if a key file could be loaded, %FALSE othewise
+ * Returns: %TRUE if a key file could be loaded, %FALSE otherwise
* Since: 2.6
**/
gboolean
@@ -3487,7 +3487,7 @@ g_key_file_get_key_comment (GKeyFile *key_file,
string = NULL;
/* Then find all the comments already associated with the
- * key and concatentate them.
+ * key and concatenate them.
*/
tmp = key_node->next;
if (!key_node->next)
diff --git a/glib/gmacros.h b/glib/gmacros.h
index 566461115..d953de4c8 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -89,7 +89,7 @@
* in a compatible way before this feature was supported in all
* compilers. These days, GLib requires inlining support from the
* compiler, so your GLib-using programs can safely assume that the
- * "inline" keywork works properly.
+ * "inline" keyword works properly.
*
* Never use this macro anymore. Just say "static inline".
*
diff --git a/glib/gmessages.c b/glib/gmessages.c
index ea3f6c1e9..eb814cfeb 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -3063,7 +3063,7 @@ escape_string (GString *string)
*
* - `G_MESSAGES_PREFIXED`: A :-separated list of log levels for which
* messages should be prefixed by the program name and PID of the
- * aplication.
+ * application.
*
* - `G_MESSAGES_DEBUG`: A space-separated list of log domains for
* which debug and informational messages are printed. By default
diff --git a/glib/gnode.c b/glib/gnode.c
index de98fd575..4becb683d 100644
--- a/glib/gnode.c
+++ b/glib/gnode.c
@@ -834,7 +834,7 @@ g_node_depth_traverse_level (GNode *node,
* its grandchildren, and so on. Note that this is less
* efficient than the other orders.
*
- * Specifies the type of traveral performed by g_tree_traverse(),
+ * Specifies the type of traversal performed by g_tree_traverse(),
* g_node_traverse() and g_node_find(). The different orders are
* illustrated here:
* - In order: A, B, C, D, E, F, G, H, I
diff --git a/glib/grand.c b/glib/grand.c
index cf935fc18..3d6dc60f7 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -582,7 +582,7 @@ gdouble
g_rand_double (GRand *rand)
{
/* We set all 52 bits after the point for this, not only the first
- 32. Thats why we need two calls to g_rand_int */
+ 32. That's why we need two calls to g_rand_int */
gdouble retval = g_rand_int (rand) * G_RAND_DOUBLE_TRANSFORM;
retval = (retval + g_rand_int (rand)) * G_RAND_DOUBLE_TRANSFORM;
diff --git a/glib/grand.h b/glib/grand.h
index 82528c77b..d64e50253 100644
--- a/glib/grand.h
+++ b/glib/grand.h
@@ -37,7 +37,7 @@ typedef struct _GRand GRand;
/* GRand - a good and fast random number generator: Mersenne Twister
* see http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html for more info.
- * The range functions return a value in the intervall [begin, end).
+ * The range functions return a value in the interval [begin, end).
* int -> [0..2^32-1]
* int_range -> [begin..end-1]
* double -> [0..1)
diff --git a/glib/gregex.c b/glib/gregex.c
index cef091ed9..52416bbb9 100644
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -186,7 +186,7 @@ G_STATIC_ASSERT (G_REGEX_MATCH_PARTIAL_SOFT == PCRE_PARTIAL_SOFT);
G_STATIC_ASSERT (G_REGEX_MATCH_PARTIAL_HARD == PCRE_PARTIAL_HARD);
G_STATIC_ASSERT (G_REGEX_MATCH_NOTEMPTY_ATSTART == PCRE_NOTEMPTY_ATSTART);
-/* These PCRE flags are unused or not exposed publically in GRegexFlags, so
+/* These PCRE flags are unused or not exposed publicly in GRegexFlags, so
* it should be ok to reuse them for different things.
*/
G_STATIC_ASSERT (G_REGEX_OPTIMIZE == PCRE_NO_UTF8_CHECK);
@@ -1285,7 +1285,7 @@ static pcre *regex_compile (const gchar *pattern,
* Compiles the regular expression to an internal form, and does
* the initial setup of the #GRegex structure.
*
- * Returns: (nullable): a #GRegex structure or %NULL if an error occured. Call
+ * Returns: (nullable): a #GRegex structure or %NULL if an error occurred. Call
* g_regex_unref() when you are done with it
*
* Since: 2.14
@@ -2785,7 +2785,7 @@ interpolation_list_needs_match (GList *list)
* If you do not need to use backreferences use g_regex_replace_literal().
*
* The @replacement string must be UTF-8 encoded even if #G_REGEX_RAW was
- * passed to g_regex_new(). If you want to use not UTF-8 encoded stings
+ * passed to g_regex_new(). If you want to use not UTF-8 encoded strings
* you can use g_regex_replace_literal().
*
* Setting @start_position differs from just passing over a shortened
diff --git a/glib/gslice.c b/glib/gslice.c
index 13479955a..a868609d6 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -141,10 +141,10 @@
* - the thread magazines. for each (aligned) chunk size, a magazine (a list)
* of recently freed and soon to be allocated chunks is maintained per thread.
* this way, most alloc/free requests can be quickly satisfied from per-thread
- * free lists which only require one g_private_get() call to retrive the
+ * free lists which only require one g_private_get() call to retrieve the
* thread handle.
* - the magazine cache. allocating and freeing chunks to/from threads only
- * occours at magazine sizes from a global depot of magazines. the depot
+ * occurs at magazine sizes from a global depot of magazines. the depot
* maintaines a 15 second working set of allocated magazines, so full
* magazines are not allocated and released too often.
* the chunk size dependent magazine sizes automatically adapt (within limits,
@@ -291,7 +291,7 @@ static SliceConfig slice_config = {
};
static GMutex smc_tree_mutex; /* mutex for G_SLICE=debug-blocks */
-/* --- auxiliary funcitons --- */
+/* --- auxiliary functions --- */
void
g_slice_set_config (GSliceConfig ckey,
gint64 value)
diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c
index 293d6c0a8..efc2e4970 100644
--- a/glib/gspawn-win32-helper.c
+++ b/glib/gspawn-win32-helper.c
@@ -98,7 +98,7 @@ protect_wargv (gint argc,
{
if (*p == ' ' || *p == '\t')
need_dblquotes = TRUE;
- /* estimate max len, assuming that all escapable chracters will be escaped */
+ /* estimate max len, assuming that all escapable characters will be escaped */
if (*p == '"' || *p == '\\')
len += 2;
else
@@ -112,7 +112,7 @@ protect_wargv (gint argc,
if (need_dblquotes)
*q++ = '"';
- /* Only quotes and backslashes preceeding quotes are escaped:
+ /* Only quotes and backslashes preceding quotes are escaped:
* see "Parsing C Command-Line Arguments" at
* https://docs.microsoft.com/en-us/cpp/c-language/parsing-c-command-line-arguments
*/
@@ -122,12 +122,12 @@ protect_wargv (gint argc,
{
/* Add backslash for escaping quote itself */
*q++ = '\\';
- /* Add backslash for every preceeding backslash for escaping it */
+ /* Add backslash for every preceding backslash for escaping it */
for (;pre_bslash > 0; --pre_bslash)
*q++ = '\\';
}
- /* Count length of continuous sequence of preceeding backslashes. */
+ /* Count length of continuous sequence of preceding backslashes. */
if (*p == '\\')
++pre_bslash;
else
@@ -139,7 +139,7 @@ protect_wargv (gint argc,
if (need_dblquotes)
{
- /* Add backslash for every preceeding backslash for escaping it,
+ /* Add backslash for every preceding backslash for escaping it,
* do NOT escape quote itself.
*/
for (;pre_bslash > 0; --pre_bslash)
diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index c1b024c03..f7559f80a 100644
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -138,7 +138,7 @@ protect_argv_string (const gchar *string)
{
if (*p == ' ' || *p == '\t')
need_dblquotes = TRUE;
- /* estimate max len, assuming that all escapable chracters will be escaped */
+ /* estimate max len, assuming that all escapable characters will be escaped */
if (*p == '"' || *p == '\\')
len += 2;
else
@@ -151,7 +151,7 @@ protect_argv_string (const gchar *string)
if (need_dblquotes)
*q++ = '"';
- /* Only quotes and backslashes preceeding quotes are escaped:
+ /* Only quotes and backslashes preceding quotes are escaped:
* see "Parsing C Command-Line Arguments" at
* https://docs.microsoft.com/en-us/cpp/c-language/parsing-c-command-line-arguments
*/
@@ -161,12 +161,12 @@ protect_argv_string (const gchar *string)
{
/* Add backslash for escaping quote itself */
*q++ = '\\';
- /* Add backslash for every preceeding backslash for escaping it */
+ /* Add backslash for every preceding backslash for escaping it */
for (;pre_bslash > 0; --pre_bslash)
*q++ = '\\';
}
- /* Count length of continuous sequence of preceeding backslashes. */
+ /* Count length of continuous sequence of preceding backslashes. */
if (*p == '\\')
++pre_bslash;
else
@@ -178,7 +178,7 @@ protect_argv_string (const gchar *string)
if (need_dblquotes)
{
- /* Add backslash for every preceeding backslash for escaping it,
+ /* Add backslash for every preceding backslash for escaping it,
* do NOT escape quote itself.
*/
for (;pre_bslash > 0; --pre_bslash)
diff --git a/glib/gspawn.h b/glib/gspawn.h
index 240aae768..f91453a3c 100644
--- a/glib/gspawn.h
+++ b/glib/gspawn.h
@@ -157,7 +157,7 @@ typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
* execute, while the remaining elements are the actual argument vector
* to pass to the file. Normally g_spawn_async_with_pipes() uses `argv[0]`
* as the file to execute, and passes all of `argv` to the child.
- * @G_SPAWN_SEARCH_PATH_FROM_ENVP: if `argv[0]` is not an abolute path,
+ * @G_SPAWN_SEARCH_PATH_FROM_ENVP: if `argv[0]` is not an absolute path,
* it will be looked for in the `PATH` from the passed child environment.
* Since: 2.34
* @G_SPAWN_CLOEXEC_PIPES: create all pipes with the `O_CLOEXEC` flag set.
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index a31ee3c36..31e4cf2f4 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -1769,7 +1769,7 @@ g_ascii_digit_value (gchar c)
* g_ascii_xdigit_value:
* @c: an ASCII character.
*
- * Determines the numeric value of a character as a hexidecimal
+ * Determines the numeric value of a character as a hexadecimal
* digit. Differs from g_unichar_xdigit_value() because it takes
* a char, so there's no worry about sign extension if characters
* are signed.
diff --git a/glib/gtester-report.in b/glib/gtester-report.in
index e5121f709..b8291d2b4 100644
--- a/glib/gtester-report.in
+++ b/glib/gtester-report.in
@@ -402,7 +402,7 @@ class GTestCase(object):
txt = self._error_text(self._case)
details['error'] = Content(mime_utf8, lambda:[txt])
if self._get_outcome() == 'addSuccess':
- # Sucessful tests may have performance metrics.
+ # Successful tests may have performance metrics.
perflist = list_children(self._case, 'performance')
if perflist:
presults = []
diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index 1de044851..54f74f2f8 100644
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -62,8 +62,8 @@ g_thread_abort (gint status,
}
/* Starting with Vista and Windows 2008, we have access to the
- * CONDITION_VARIABLE and SRWLock primatives on Windows, which are
- * pretty reasonable approximations of the primatives specified in
+ * CONDITION_VARIABLE and SRWLock primitives on Windows, which are
+ * pretty reasonable approximations of the primitives specified in
* POSIX 2001 (pthread_cond_t and pthread_mutex_t respectively).
*
* Both of these types are structs containing a single pointer. That
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 5a835dea9..0bea41297 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -61,7 +61,7 @@
* g_time_zone_get_identifier().
*
* A time zone contains a number of intervals. Each interval has
- * an abbreviation to describe it (for example, ‘PDT’), an offet to UTC and a
+ * an abbreviation to describe it (for example, ‘PDT’), an offset to UTC and a
* flag indicating if the daylight savings time is in effect during that
* interval. A time zone always has at least one interval — interval 0. Note
* that interval abbreviations are not the same as time zone identifiers
diff --git a/glib/guniprop.c b/glib/guniprop.c
index 0e76c42a1..619b39908 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -362,7 +362,7 @@ g_unichar_istitle (gunichar c)
* g_unichar_isxdigit:
* @c: a Unicode character.
*
- * Determines if a character is a hexidecimal digit.
+ * Determines if a character is a hexadecimal digit.
*
* Returns: %TRUE if the character is a hexadecimal digit
**/
@@ -624,7 +624,7 @@ g_unichar_totitle (gunichar c)
{
unsigned int i;
- /* We handle U+0000 explicitely because some elements in
+ /* We handle U+0000 explicitly because some elements in
* title_table[i][1] may be null. */
if (c == 0)
return c;
@@ -664,7 +664,7 @@ g_unichar_digit_value (gunichar c)
* g_unichar_xdigit_value:
* @c: a Unicode character
*
- * Determines the numeric value of a character as a hexidecimal
+ * Determines the numeric value of a character as a hexadecimal
* digit.
*
* Returns: If @c is a hex digit (according to
diff --git a/glib/gutf8.c b/glib/gutf8.c
index d1e8879ae..bcb4f56bc 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -1000,7 +1000,7 @@ g_ucs4_to_utf8 (const gunichar *str,
* Note that the input is expected to be already in native endianness,
* an initial byte-order-mark character is not handled specially.
* g_convert() can be used to convert a byte buffer of UTF-16 data of
- * ambiguous endianess.
+ * ambiguous endianness.
*
* Further note that this function does not validate the result
* string; it may e.g. include embedded NUL characters. The only
diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
index b2470c488..10543ff9c 100644
--- a/glib/gvariant-core.c
+++ b/glib/gvariant-core.c
@@ -795,7 +795,7 @@ g_variant_ref_sink (GVariant *value)
*
* Using this function on the return value of the user's callback allows
* the user to do whichever is more convenient for them. The caller
- * will alway receives exactly one full reference to the value: either
+ * will always receives exactly one full reference to the value: either
* the one that was returned in the first place, or a floating reference
* that has been converted to a full reference.
*
diff --git a/glib/gvariant.c b/glib/gvariant.c
index 1e524801a..49fb60544 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -3004,7 +3004,7 @@ g_variant_iter_init (GVariantIter *iter,
* need it.
*
* A reference is taken to the container that @iter is iterating over
- * and will be releated only when g_variant_iter_free() is called.
+ * and will be related only when g_variant_iter_free() is called.
*
* Returns: (transfer full): a new heap-allocated #GVariantIter
*
diff --git a/glib/gvarianttypeinfo.h b/glib/gvarianttypeinfo.h
index 6ecd1d4bb..8663e2090 100644
--- a/glib/gvarianttypeinfo.h
+++ b/glib/gvarianttypeinfo.h
@@ -80,7 +80,7 @@ typedef struct _GVariantTypeInfo GVariantTypeInfo;
*
* The constants in this structure are used as follows:
*
- * First, among the array of offets contained in the tuple, 'i' is the
+ * First, among the array of offsets contained in the tuple, 'i' is the
* index of the offset that refers to the end of the variable-sized item
* preceding the item of interest. If no variable-sized items precede
* this item, then 'i' will be -1.
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 2f2fe05a8..f2a5f3765 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -386,7 +386,7 @@ get_package_directory_from_module (const gchar *module_name)
* installations of different versions of some GLib-using library, or
* GLib itself, is desirable for various reasons.
*
- * For this reason it is recommeded to always pass %NULL as
+ * For this reason it is recommended to always pass %NULL as
* @package to this function, to avoid the temptation to use the
* Registry. In version 2.20 of GLib the @package parameter
* will be ignored and this function won't look in the Registry at all.
@@ -1049,7 +1049,7 @@ static void *WinVEH_handle = NULL;
* * EXCEPTION_STACK_OVERFLOW
* * EXCEPTION_ILLEGAL_INSTRUCTION
* To make it stop at other exceptions one should set the G_VEH_CATCH
- * environment variable to a list of comma-separated hexademical numbers,
+ * environment variable to a list of comma-separated hexadecimal numbers,
* where each number is the code of an exception that should be caught.
* This is done to prevent GLib from breaking when Windows uses
* exceptions to shuttle information (SetThreadName(), OutputDebugString())
diff --git a/glib/tests/1bit-mutex.c b/glib/tests/1bit-mutex.c
index 9a5252ca4..b7b06d734 100644
--- a/glib/tests/1bit-mutex.c
+++ b/glib/tests/1bit-mutex.c
@@ -129,7 +129,7 @@ testcase (gconstpointer data)
#define SUFFIX "-emufutex"
/* ensure that we are using the emulated futex by checking
- * (at compile-time) for the existance of 'g_futex_address_list'
+ * (at compile-time) for the existence of 'g_futex_address_list'
*/
g_assert (g_futex_address_list == NULL);
#else
diff --git a/glib/tests/bytes.c b/glib/tests/bytes.c
index 5ea5c2b35..a65d3a9a3 100644
--- a/glib/tests/bytes.c
+++ b/glib/tests/bytes.c
@@ -404,10 +404,10 @@ main (int argc, char *argv[])
g_test_add_func ("/bytes/hash", test_hash);
g_test_add_func ("/bytes/equal", test_equal);
g_test_add_func ("/bytes/compare", test_compare);
- g_test_add_func ("/bytes/to-data/transfered", test_to_data_transferred);
+ g_test_add_func ("/bytes/to-data/transferred", test_to_data_transferred);
g_test_add_func ("/bytes/to-data/two-refs", test_to_data_two_refs);
g_test_add_func ("/bytes/to-data/non-malloc", test_to_data_non_malloc);
- g_test_add_func ("/bytes/to-array/transfered", test_to_array_transferred);
+ g_test_add_func ("/bytes/to-array/transferred", test_to_array_transferred);
g_test_add_func ("/bytes/to-array/two-refs", test_to_array_two_refs);
g_test_add_func ("/bytes/to-array/non-malloc", test_to_array_non_malloc);
g_test_add_func ("/bytes/null", test_null);
diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c
index 0c84e326d..46c54e805 100644
--- a/glib/tests/fileutils.c
+++ b/glib/tests/fileutils.c
@@ -1110,7 +1110,7 @@ test_stdio_wrappers (void)
/* Win32 does not support "wb+", but g_fopen() should automatically
* translate this mode to its alias "w+b".
- * Also check various other file open modes for correct support accross
+ * Also check various other file open modes for correct support across
* platforms.
* See: https://gitlab.gnome.org/GNOME/glib/merge_requests/119
*/
diff --git a/glib/tests/option-argv0.c b/glib/tests/option-argv0.c
index 5b626df70..ce3609743 100644
--- a/glib/tests/option-argv0.c
+++ b/glib/tests/option-argv0.c
@@ -57,7 +57,7 @@ test_platform_argv0 (void)
* how it does (the test code itself doesn't use any platform-specific
* functionality, the difference is internal to glib, so it's quite
* possible to run this test everywhere - it just won't pass on some
- * platforms). Make errors non-fatal on these other plaforms,
+ * platforms). Make errors non-fatal on these other platforms,
* to prevent them from crashing hard on failed assertions,
* and make them call g_test_skip() instead.
*/
diff --git a/glib/tests/test-printf.c b/glib/tests/test-printf.c
index 486ae6d4f..dd1107432 100644
--- a/glib/tests/test-printf.c
+++ b/glib/tests/test-printf.c
@@ -413,7 +413,7 @@ test_f (void)
gchar buf[128];
gint res;
- /* %f, basic formattting */
+ /* %f, basic formatting */
res = g_snprintf (buf, 128, "%f", G_PI);
g_assert_cmpint (res, ==, 8);
diff --git a/glib/tests/win32.c b/glib/tests/win32.c
index a6ba4e261..97e5887cf 100644
--- a/glib/tests/win32.c
+++ b/glib/tests/win32.c
@@ -112,13 +112,13 @@ static void
test_veh_debug (void)
{
/* Run a test that crashes and runs a debugger */
- g_test_trap_subprocess ("/win32/subprocess/debugee", 0, 0);
+ g_test_trap_subprocess ("/win32/subprocess/debuggee", 0, 0);
g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("Exception code=0xc0000005*Debugger invoked, attaching to*");
}
static void
-test_veh_debugee (void)
+test_veh_debuggee (void)
{
/* Set up a debugger to be run on crash */
gchar *command = g_strdup_printf ("%s %s", argv0, "%p %e");
@@ -139,7 +139,7 @@ veh_debugger (int argc, char *argv[])
char *end;
DWORD pid = strtoul (argv[1], &end, 10);
guintptr event = (guintptr) _strtoui64 (argv[2], &end, 10);
- /* Unfreeze the debugee and announce ourselves */
+ /* Unfreeze the debuggee and announce ourselves */
SetEvent ((HANDLE) event);
CloseHandle ((HANDLE) event);
g_fprintf (stderr, "Debugger invoked, attaching to %lu and signalling %" G_GUINTPTR_FORMAT, pid, event);
@@ -165,7 +165,7 @@ main (int argc,
g_test_add_func ("/win32/veh/illegal_instruction", test_veh_crash_illegal_instruction);
g_test_add_func ("/win32/veh/debug", test_veh_debug);
- g_test_add_func ("/win32/subprocess/debugee", test_veh_debugee);
+ g_test_add_func ("/win32/subprocess/debuggee", test_veh_debuggee);
g_test_add_func ("/win32/subprocess/access_violation", test_access_violation);
g_test_add_func ("/win32/subprocess/illegal_instruction", test_illegal_instruction);
diff --git a/glib/update-pcre/update.sh b/glib/update-pcre/update.sh
index dece03d55..0e558dd5c 100644
--- a/glib/update-pcre/update.sh
+++ b/glib/update-pcre/update.sh
@@ -40,7 +40,7 @@ cd pcre
# pcre_chartables.c is generated by dfatables.
# We do not want to compile and execute dfatables.c every time, because
# this could be a problem (e.g. when cross-compiling), so now generate
-# the file and then distribuite it with GRegex.
+# the file and then distribute it with GRegex.
echo "Generating pcre_chartables.c"
cp -R "${PCRE}" tmp-build
cd tmp-build
diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
index fab151370..bb2df6836 100644
--- a/gmodule/gmodule-dl.c
+++ b/gmodule/gmodule-dl.c
@@ -29,7 +29,7 @@
#include <dlfcn.h>
-/* Perl includes <nlist.h> and <link.h> instead of <dlfcn.h> on some systmes? */
+/* Perl includes <nlist.h> and <link.h> instead of <dlfcn.h> on some systems? */
/* dlerror() is not implemented on all systems
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index e71b07e48..3c67e2e54 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -186,7 +186,7 @@
/* We maintain a list of modules, so we can reference count them.
* That's needed because some platforms don't support references counts on
- * modules. Also, the module for the program itself is kept seperately for
+ * modules. Also, the module for the program itself is kept separately for
* faster access and because it has special semantics.
*/
@@ -276,7 +276,7 @@ g_module_set_error (const gchar *error)
}
-/* --- include platform specifc code --- */
+/* --- include platform specific code --- */
#define SUPPORT_OR_RETURN(rv) { g_module_set_error (NULL); }
#if (G_MODULE_IMPL == G_MODULE_IMPL_DL)
#include "gmodule-dl.c"
diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h
index 8982f5952..486684deb 100644
--- a/gmodule/gmodule.h
+++ b/gmodule/gmodule.h
@@ -101,7 +101,7 @@ const gchar * g_module_name (GModule *module);
* directory where the module file is supposed to be, or NULL or empty
* in which case it should either be in the current directory or, on
* some operating systems, in some standard place, for instance on the
- * PATH. Hence, to be absoultely sure to get the correct module,
+ * PATH. Hence, to be absolutely sure to get the correct module,
* always pass in a directory. The file name consists of the directory,
* if supplied, and 'module_name' suitably decorated according to
* the operating system's conventions (for instance lib*.so or *.dll).
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index 472f037e2..7caf9c4e6 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -659,7 +659,7 @@ g_closure_unref (GClosure *closure)
* g_source_set_closure (source, g_cclosure_new (cb_func, cb_data));
* ]|
*
- * Generally, this function is used together with g_closure_ref(). Ane example
+ * Generally, this function is used together with g_closure_ref(). An example
* of storing a closure for later notification looks like:
* |[<!-- language="C" -->
* static GClosure *notify_closure = NULL;
@@ -690,7 +690,7 @@ g_closure_sink (GClosure *closure)
/* floating is basically a kludge to avoid creating closures
* with a ref_count of 0. so the initial ref_count a closure has
* is unowned. with invoking g_closure_sink() code may
- * indicate that it takes over that intiial ref_count.
+ * indicate that it takes over that initial ref_count.
*/
if (closure->floating)
{
diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index a5c1c3fcb..a0f91f538 100644
--- a/gobject/gclosure.h
+++ b/gobject/gclosure.h
@@ -202,7 +202,7 @@ struct _GClosure
/* invariants/constraints:
* - ->marshal and ->data are _invalid_ as soon as ->is_invalid==TRUE
- * - invocation of all inotifiers occours prior to fnotifiers
+ * - invocation of all inotifiers occurs prior to fnotifiers
* - order of inotifiers is random
* inotifiers may _not_ free/invalidate parameter values (e.g. ->data)
* - order of fnotifiers is random
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 5c4aa60a6..ef9552354 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -620,7 +620,7 @@ validate_and_install_class_property (GObjectClass *class,
class->construct_properties = g_slist_append (class->construct_properties, pspec);
/* for property overrides of construct properties, we have to get rid
- * of the overidden inherited construct property
+ * of the overridden inherited construct property
*/
pspec = g_param_spec_pool_lookup (pspec_pool, pspec->name, parent_type, TRUE);
if (pspec && pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
@@ -3570,7 +3570,7 @@ g_object_get_qdata (GObject *object,
* @data: (nullable): An opaque user data pointer
*
* This sets an opaque, named pointer on an object.
- * The name is specified through a #GQuark (retrived e.g. via
+ * The name is specified through a #GQuark (retrieved e.g. via
* g_quark_from_static_string()), and the pointer
* can be gotten back from the @object with g_object_get_qdata()
* until the @object is finalized.
@@ -3719,7 +3719,7 @@ g_object_set_qdata_full (GObject *object,
* {
* // the quark, naming the object data
* GQuark quark_string_list = g_quark_from_static_string ("my-string-list");
- * // retrive the old string list
+ * // retrieve the old string list
* GList *list = g_object_steal_qdata (object, quark_string_list);
*
* // prepend new string
diff --git a/gobject/gobject.h b/gobject/gobject.h
index 2e07fa724..499329af2 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -320,7 +320,7 @@ struct _GObjectClass
GSList *construct_properties;
/*< public >*/
- /* seldom overidden */
+ /* seldom overridden */
GObject* (*constructor) (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
@@ -335,7 +335,7 @@ struct _GObjectClass
GParamSpec *pspec);
void (*dispose) (GObject *object);
void (*finalize) (GObject *object);
- /* seldom overidden */
+ /* seldom overridden */
void (*dispatch_properties_changed) (GObject *object,
guint n_pspecs,
GParamSpec **pspecs);
@@ -838,7 +838,7 @@ static inline void
*
* Updates a pointer to weakly refer to @new_object. It assigns @new_object
* to @weak_pointer_location and ensures that @weak_pointer_location will
- * automaticaly be set to %NULL if @new_object gets destroyed. The assignment
+ * automatically be set to %NULL if @new_object gets destroyed. The assignment
* is not atomic. The weak reference is not thread-safe, see
* g_object_add_weak_pointer() for details.
*
diff --git a/gobject/gparam.c b/gobject/gparam.c
index 2cd4c692c..f2bc1a051 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -707,7 +707,7 @@ g_param_value_validate (GParamSpec *pspec,
/**
* g_param_value_convert:
* @pspec: a valid #GParamSpec
- * @src_value: souce #GValue
+ * @src_value: source #GValue
* @dest_value: destination #GValue of correct type for @pspec
* @strict_validation: %TRUE requires @dest_value to conform to @pspec
* without modifications
diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
index d0e4d5953..9aac2c423 100644
--- a/gobject/gparamspecs.h
+++ b/gobject/gparamspecs.h
@@ -927,7 +927,7 @@ struct _GParamSpecObject
* another paramspec. All operations other than getting or
* setting the value are redirected, including accessing the nick and
* blurb, validating a value, and so forth. See
- * g_param_spec_get_redirect_target() for retrieving the overidden
+ * g_param_spec_get_redirect_target() for retrieving the overridden
* property. #GParamSpecOverride is used in implementing
* g_object_class_override_property(), and will not be directly useful
* unless you are implementing a new base type similar to GObject.
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 64603c291..12c725a11 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -1545,7 +1545,7 @@ g_signal_new (const gchar *signal_name,
* of a class offset for the signal's class handler. This function
* doesn't need a function pointer exposed in the class structure of
* an object definition, instead the function pointer is passed
- * directly and can be overriden by derived classes with
+ * directly and can be overridden by derived classes with
* g_signal_override_class_closure() or
* g_signal_override_class_handler()and chained to with
* g_signal_chain_from_overridden() or
@@ -2623,7 +2623,7 @@ g_signal_connect_data (gpointer instance,
*
* Blocks a handler of an instance so it will not be called during any
* signal emissions unless it is unblocked again. Thus "blocking" a
- * signal handler means to temporarily deactive it, a signal handler
+ * signal handler means to temporarily deactivate it, a signal handler
* has to be unblocked exactly the same amount of times it has been
* blocked before to become active again.
*
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 8cb9c42c0..723675d59 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1027,7 +1027,7 @@ check_add_interface_L (GType instance_type,
if (entry && entry->vtable == NULL && !type_iface_peek_holder_L (iface, NODE_TYPE (node)))
{
/* ok, we do conform to this interface already, but the interface vtable was not
- * yet intialized, and we just conform to the interface because it got added to
+ * yet initialized, and we just conform to the interface because it got added to
* one of our parents. so we allow overriding of holder info here.
*/
return TRUE;
@@ -1477,7 +1477,7 @@ type_add_interface_Wm (TypeNode *node,
type_node_add_iface_entry_W (node, NODE_TYPE (iface), NULL);
/* if the class is already (partly) initialized, we may need to base
- * initalize and/or initialize the new interface.
+ * initialize and/or initialize the new interface.
*/
if (node->data)
{
@@ -1769,7 +1769,7 @@ type_iface_blow_holder_info_Wm (TypeNode *iface,
* and structure setups for instances: actual instance creation should
* happen through functions supplied by the type's fundamental type
* implementation. So use of g_type_create_instance() is reserved for
- * implementators of fundamental types only. E.g. instances of the
+ * implementers of fundamental types only. E.g. instances of the
* #GObject hierarchy should be created via g_object_new() and never
* directly through g_type_create_instance() which doesn't handle things
* like singleton objects or object construction.
@@ -3189,7 +3189,7 @@ g_type_interface_peek_parent (gpointer g_iface)
* and returns the default interface vtable for the type.
*
* If the type is not currently in use, then the default vtable
- * for the type will be created and initalized by calling
+ * for the type will be created and initialized by calling
* the base interface init and default vtable init functions for
* the type (the @base_init and @class_init members of #GTypeInfo).
* Calling g_type_default_interface_ref() is useful when you
diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h
index 177aa3dfa..b1304595f 100644
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.h
@@ -141,7 +141,7 @@ G_STMT_START {
\
* va_list variables cannot be passed by reference.
*
* Note: If you are creating the @value argument just before calling this macro,
- * you should use the #G_VALUE_COLLECT_INIT variant and pass the unitialized
+ * you should use the #G_VALUE_COLLECT_INIT variant and pass the uninitialized
* #GValue. That variant is faster than #G_VALUE_COLLECT.
*/
#define G_VALUE_COLLECT(value, var_args, flags, __error) G_STMT_START { \
diff --git a/gobject/tests/dynamictests.c b/gobject/tests/dynamictests.c
index 59a5aebed..7a9e9e487 100644
--- a/gobject/tests/dynamictests.c
+++ b/gobject/tests/dynamictests.c
@@ -166,7 +166,7 @@ static gpointer
ref_unref_thread (gpointer data)
{
gint i;
- /* first, syncronize with other threads,
+ /* first, synchronize with other threads,
*/
if (g_test_verbose())
g_printerr ("WAITING!\n");
diff --git a/gobject/tests/ifaceproperties.c b/gobject/tests/ifaceproperties.c
index 569f42dfe..4d0053eea 100644
--- a/gobject/tests/ifaceproperties.c
+++ b/gobject/tests/ifaceproperties.c
@@ -379,7 +379,7 @@ derived_object_class_init (DerivedObjectClass *class)
object_class->set_property = derived_object_set_property;
object_class->get_property = derived_object_get_property;
- /* Overriding a property that is itself overridding an interface property */
+ /* Overriding a property that is itself overriding an interface property */
g_object_class_override_property (object_class, DERIVED_PROP3, "prop3");
/* Overriding a property not from an interface */
diff --git a/gobject/tests/properties.c b/gobject/tests/properties.c
index 1e48e3389..23d507c0b 100644
--- a/gobject/tests/properties.c
+++ b/gobject/tests/properties.c
@@ -87,7 +87,7 @@ test_object_finalize (GObject *gobject)
/* When the ref_count of an object is zero it is still
* possible to notify the property, but it should do
- * nothing and silenty quit (bug #705570)
+ * nothing and silently quit (bug #705570)
*/
g_object_notify (gobject, "foo");
g_object_notify_by_pspec (gobject, properties[PROP_BAR]);
@@ -223,54 +223,54 @@ typedef struct {
static void
on_notify (GObject *gobject,
GParamSpec *pspec,
- TestNotifyClosure *clos)
+ TestNotifyClosure *closure)
{
- g_assert (clos->pspec == pspec);
- g_assert_cmpstr (clos->name, ==, pspec->name);
- clos->fired = TRUE;
+ g_assert (closure->pspec == pspec);
+ g_assert_cmpstr (closure->name, ==, pspec->name);
+ closure->fired = TRUE;
}
static void
properties_notify (void)
{
TestObject *obj = g_object_new (test_object_get_type (), NULL);
- TestNotifyClosure clos;
+ TestNotifyClosure closure;
g_assert (properties[PROP_FOO] != NULL);
g_assert (properties[PROP_QUUX] != NULL);
- g_signal_connect (obj, "notify", G_CALLBACK (on_notify), &clos);
+ g_signal_connect (obj, "notify", G_CALLBACK (on_notify), &closure);
- clos.name = "foo";
- clos.pspec = properties[PROP_FOO];
+ closure.name = "foo";
+ closure.pspec = properties[PROP_FOO];
- clos.fired = FALSE;
+ closure.fired = FALSE;
g_object_set (obj, "foo", 47, NULL);
- g_assert (clos.fired);
+ g_assert (closure.fired);
- clos.name = "baz";
- clos.pspec = properties[PROP_BAZ];
+ closure.name = "baz";
+ closure.pspec = properties[PROP_BAZ];
- clos.fired = FALSE;
+ closure.fired = FALSE;
g_object_set (obj, "baz", "something new", NULL);
- g_assert (clos.fired);
+ g_assert (closure.fired);
/* baz lacks explicit notify, so we will see this twice */
- clos.fired = FALSE;
+ closure.fired = FALSE;
g_object_set (obj, "baz", "something new", NULL);
- g_assert (clos.fired);
+ g_assert (closure.fired);
/* quux on the other hand, ... */
- clos.name = "quux";
- clos.pspec = properties[PROP_QUUX];
+ closure.name = "quux";
+ closure.pspec = properties[PROP_QUUX];
- clos.fired = FALSE;
+ closure.fired = FALSE;
g_object_set (obj, "quux", "something new", NULL);
- g_assert (clos.fired);
+ g_assert (closure.fired);
/* no change; no notify */
- clos.fired = FALSE;
+ closure.fired = FALSE;
g_object_set (obj, "quux", "something new", NULL);
- g_assert (!clos.fired);
+ g_assert (!closure.fired);
g_object_unref (obj);
diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c
index bb57bd4a8..f7042c837 100644
--- a/gobject/tests/threadtests.c
+++ b/gobject/tests/threadtests.c
@@ -94,7 +94,7 @@ tester_init_thread (gpointer data)
{
const GInterfaceInfo face2_interface_info = { (GInterfaceInitFunc) interface_per_class_init, NULL, NULL };
gpointer klass;
- /* first, syncronize with other threads,
+ /* first, synchronize with other threads,
* then run interface and class initializers,
* using unsafe_call_counter concurrently
*/
diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4
index 7491f1be4..d36a0cea4 100644
--- a/m4macros/glib-2.0.m4
+++ b/m4macros/glib-2.0.m4
@@ -90,7 +90,7 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$GLIB_LIBS $LIBS"
dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl Now check if the installed GLib is sufficiently new. (Also sanity
dnl checks the results of pkg-config to some extent)
dnl
rm -f conf.glibtest
@@ -120,7 +120,7 @@ main (void)
glib_major_version, glib_minor_version, glib_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
@@ -130,7 +130,7 @@ main (void)
(glib_minor_version != GLIB_MINOR_VERSION) ||
(glib_micro_version != GLIB_MICRO_VERSION))
{
- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+ printf("*** GLib header files (version %d.%d.%d) do not match\n",
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
glib_major_version, glib_minor_version, glib_micro_version);
@@ -145,18 +145,18 @@ main (void)
}
else
{
- printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
+ printf("\n*** An old version of GLib (%u.%u.%u) was found.\n",
glib_major_version, glib_minor_version, glib_micro_version);
- printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
+ printf("*** You need a version of GLib newer than %u.%u.%u. The latest version of\n",
major, minor, micro);
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n";);
+ printf("*** GLib is always available from ftp://ftp.gtk.org.\n";);
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+ printf("*** of GLib, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
@@ -179,7 +179,7 @@ main (void)
if test -f conf.glibtest ; then
:
else
- echo "*** Could not run GLIB test program, checking why..."
+ echo "*** Could not run GLib test program, checking why..."
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
@@ -189,8 +189,8 @@ main (void)
#include <stdio.h>
], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+ echo "*** that the run-time linker is not finding GLib or finding the wrong"
+ echo "*** version of GLib. If it is not finding GLib, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
@@ -198,7 +198,7 @@ main (void)
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
+ echo "*** exact error that occurred. This usually means GLib is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
diff --git a/tests/gobject/performance-threaded.c b/tests/gobject/performance-threaded.c
index 521816e59..30ea5bd80 100644
--- a/tests/gobject/performance-threaded.c
+++ b/tests/gobject/performance-threaded.c
@@ -205,7 +205,7 @@ static GOptionEntry cmd_entries[] = {
{"verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
"Print extra information", NULL},
{"threads", 't', 0, G_OPTION_ARG_INT, &n_threads,
- "number of threads to run in parrallel", NULL},
+ "number of threads to run in parallel", NULL},
{"seconds", 's', 0, G_OPTION_ARG_INT, &test_length,
"Time to run each test in seconds", NULL},
{"list", 'l', 0, G_OPTION_ARG_NONE, &list,
diff --git a/tests/gobject/performance.c b/tests/gobject/performance.c
index 525a1888b..236ffaed0 100644
--- a/tests/gobject/performance.c
+++ b/tests/gobject/performance.c
@@ -25,7 +25,7 @@
#define DEFAULT_TEST_TIME 15 /* seconds */
/* The time we want each round to take, in seconds, this should
* be large enough compared to the timer resolution, but small
- * enought that the risk of any random slowness will miss the
+ * enough that the risk of any random slowness will miss the
* running window */
#define TARGET_ROUND_TIME 0.008
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
