summaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
authorRafael Fontenelle <rafaelff@gnome.org>2018-09-30 11:30:18 -0300
committerThomas Haller <thaller@redhat.com>2018-09-30 21:14:55 +0200
commit570a1de4d6fbf0d8ca6a039c728232f81179c727 (patch)
tree1ceda46527650a6188c26d48a294a291ad0f56d6 /shared
parent3d56bd525af4b00743e813e24b8df0f2ba74e5be (diff)
Fix typos
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/21 [thaller@redhat.com: fix generated clients/common/settings-docs.h.in file and fix wrong change in src/systemd/src/libsystemd/sd-event/sd-event.c]
Diffstat (limited to 'shared')
-rw-r--r--shared/c-siphash/src/c-siphash.c4
-rw-r--r--shared/n-acd/src/n-acd-bpf-fallback.c2
-rw-r--r--shared/n-acd/src/test-veth.c2
-rw-r--r--shared/n-acd/src/util/timer.c2
-rw-r--r--shared/nm-default.h2
-rw-r--r--shared/nm-utils/nm-dedup-multi.c6
-rw-r--r--shared/nm-utils/nm-dedup-multi.h8
-rw-r--r--shared/nm-utils/nm-io-utils.c4
-rw-r--r--shared/nm-utils/nm-macros-internal.h12
-rw-r--r--shared/nm-utils/nm-random-utils.c2
-rw-r--r--shared/nm-utils/nm-shared-utils.c2
11 files changed, 23 insertions, 23 deletions
diff --git a/shared/c-siphash/src/c-siphash.c b/shared/c-siphash/src/c-siphash.c
index 76b25b868..5cea6f2b5 100644
--- a/shared/c-siphash/src/c-siphash.c
+++ b/shared/c-siphash/src/c-siphash.c
@@ -55,7 +55,7 @@ static inline void c_siphash_sipround(CSipHash *state) {
* @seed: 128bit seed
*
* This initializes the siphash state context. Once initialized, it can be used
- * to hash arbitary input. To feed data into it, use c_siphash_append(). To get
+ * to hash arbitrary input. To feed data into it, use c_siphash_append(). To get
* the final hash, use c_siphash_finalize().
*
* Note that the siphash context does not allocate state. There is no need to
@@ -134,7 +134,7 @@ _public_ void c_siphash_append(CSipHash *state, const uint8_t *bytes, size_t n_b
end -= (state->n_bytes % sizeof(uint64_t));
/*
- * We are now guaranteed to be at a 64bit state boudary. Hence, we can
+ * We are now guaranteed to be at a 64bit state boundary. Hence, we can
* operate in 64bit chunks on all input. This is much faster than the
* one-byte-at-a-time loop.
*/
diff --git a/shared/n-acd/src/n-acd-bpf-fallback.c b/shared/n-acd/src/n-acd-bpf-fallback.c
index 5e6bdd067..7270cfd9f 100644
--- a/shared/n-acd/src/n-acd-bpf-fallback.c
+++ b/shared/n-acd/src/n-acd-bpf-fallback.c
@@ -1,7 +1,7 @@
/*
* A noop implementation of eBPF filter for IPv4 Address Conflict Detection
*
- * These are a collection of dummy funcitons that have no effect, but allows
+ * These are a collection of dummy functions that have no effect, but allows
* n-acd to compile without eBPF support.
*
* See n-acd-bpf.c for documentation.
diff --git a/shared/n-acd/src/test-veth.c b/shared/n-acd/src/test-veth.c
index 64724f5e9..7e316ac42 100644
--- a/shared/n-acd/src/test-veth.c
+++ b/shared/n-acd/src/test-veth.c
@@ -1,7 +1,7 @@
/*
* Test on a veth link
*
- * This essentially mimics a real nework with two peers.
+ * This essentially mimics a real network with two peers.
*
* Run one ACD context on each end of the tunnel. On one end probe for N,
* addresses on the other end pre-configure N/3 of the same addresses and probe
diff --git a/shared/n-acd/src/util/timer.c b/shared/n-acd/src/util/timer.c
index c995ba400..29627af77 100644
--- a/shared/n-acd/src/util/timer.c
+++ b/shared/n-acd/src/util/timer.c
@@ -55,7 +55,7 @@ void timer_rearm(Timer *timer) {
/*
* A timeout value of 0 clears the timer, we sholud only set that if
- * no timout exists in the tree.
+ * no timeout exists in the tree.
*/
timeout = c_rbnode_entry(c_rbtree_first(&timer->tree), Timeout, node);
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 8bcc5c704..207acd202 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -179,7 +179,7 @@
#if NM_MORE_ASSERTS == 0
#ifndef G_DISABLE_CAST_CHECKS
/* Unless compiling with G_DISABLE_CAST_CHECKS, glib performs type checking
- * during G_VARIANT_TYPE() via g_variant_type_checked_(). This is not necesary
+ * during G_VARIANT_TYPE() via g_variant_type_checked_(). This is not necessary
* because commonly this cast is needed during something like
*
* g_variant_builder_init (&props, G_VARIANT_TYPE ("a{sv}"));
diff --git a/shared/nm-utils/nm-dedup-multi.c b/shared/nm-utils/nm-dedup-multi.c
index fc134e250..852c207c7 100644
--- a/shared/nm-utils/nm-dedup-multi.c
+++ b/shared/nm-utils/nm-dedup-multi.c
@@ -159,7 +159,7 @@ _entry_unpack (const NMDedupMultiEntry *entry,
ASSERT_idx_type (*out_idx_type);
/* for lookup of the head, we allow to omit object, but only
- * if the idx_type does not parition the objects. Otherwise, we
+ * if the idx_type does not partition the objects. Otherwise, we
* require a obj to compare. */
nm_assert ( !*out_lookup_head
|| ( *out_obj
@@ -441,10 +441,10 @@ nm_dedup_multi_index_add (NMDedupMultiIndex *self,
* object will be placed in. You can omit this, and it will be automatically
* detected (at the expense of an additional hash lookup).
* Basically, this is the result of nm_dedup_multi_index_lookup_obj(),
- * with the pecularity that if you know that @obj is not yet tracked,
+ * with the peculiarity that if you know that @obj is not yet tracked,
* you may specify %NM_DEDUP_MULTI_ENTRY_MISSING.
* @head_existing: an optional argument to safe a lookup for the head. If specified,
- * it must be identical to nm_dedup_multi_index_lookup_head(), with the pecularity
+ * it must be identical to nm_dedup_multi_index_lookup_head(), with the peculiarity
* that if the head is not yet tracked, you may specify %NM_DEDUP_MULTI_HEAD_ENTRY_MISSING
* @out_entry: if give, return the added entry. This entry may have already exists (update)
* or be newly created. If @obj is not partitionable according to @idx_type, @obj
diff --git a/shared/nm-utils/nm-dedup-multi.h b/shared/nm-utils/nm-dedup-multi.h
index 8d482de9c..845b4c3ef 100644
--- a/shared/nm-utils/nm-dedup-multi.h
+++ b/shared/nm-utils/nm-dedup-multi.h
@@ -47,7 +47,7 @@ typedef enum _NMDedupMultiIdxMode {
NM_DEDUP_MULTI_IDX_MODE_APPEND,
/* like NM_DEDUP_MULTI_IDX_MODE_APPEND, but if the object
- * is already in teh cache, move it to the end. */
+ * is already in the cache, move it to the end. */
NM_DEDUP_MULTI_IDX_MODE_APPEND_FORCE,
} NMDedupMultiIdxMode;
@@ -85,7 +85,7 @@ static inline const NMDedupMultiObj *
nm_dedup_multi_obj_ref (const NMDedupMultiObj *obj)
{
/* ref and unref accept const pointers. Objects is supposed to be shared
- * and kept immutable. Disallowing to take/retrun a reference to a const
+ * and kept immutable. Disallowing to take/return a reference to a const
* NMPObject is cumbersome, because callers are precisely expected to
* keep a ref on the otherwise immutable object. */
@@ -131,12 +131,12 @@ void nm_dedup_multi_index_obj_release (NMDedupMultiIndex *self,
* routes by ifindex. As the ifindex is dynamic, it does not create an
* idx-type instance for each ifindex. Instead, it has one idx-type for
* all routes. But whenever accessing NMDedupMultiIndex with an NMDedupMultiObj,
- * the partitioning NMDedupMultiIdxType takes into accound the NMDedupMultiObj
+ * the partitioning NMDedupMultiIdxType takes into account the NMDedupMultiObj
* instance to associate it with the right list.
*
* Hence, a NMDedupMultiIdxEntry has a list of possibly multiple NMDedupMultiHeadEntry
* instances, which each is the head for a list of NMDedupMultiEntry instances.
- * In the platform example, the NMDedupMultiHeadEntry parition the indexed objects
+ * In the platform example, the NMDedupMultiHeadEntry partition the indexed objects
* by their ifindex. */
struct _NMDedupMultiIdxType {
union {
diff --git a/shared/nm-utils/nm-io-utils.c b/shared/nm-utils/nm-io-utils.c
index b64c09dec..06f756c41 100644
--- a/shared/nm-utils/nm-io-utils.c
+++ b/shared/nm-utils/nm-io-utils.c
@@ -110,7 +110,7 @@ _mem_realloc (char *old, gboolean do_bzero_mem, gsize cur_len, gsize new_len)
* A reimplementation of g_file_get_contents() with a few differences:
* - accepts an open fd, instead of a path name. This allows you to
* use openat().
- * - limits the maxium filesize to max_length.
+ * - limits the maximum filesize to max_length.
*
* Returns: a negative error code on failure.
*/
@@ -268,7 +268,7 @@ nm_utils_fd_get_contents (int fd,
*
* A reimplementation of g_file_get_contents() with a few differences:
* - accepts an @dirfd to open @filename relative to that path via openat().
- * - limits the maxium filesize to max_length.
+ * - limits the maximum filesize to max_length.
* - uses O_CLOEXEC on internal file descriptor
*
* Returns: a negative error code on failure.
diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h
index 084219b4b..b8b945342 100644
--- a/shared/nm-utils/nm-macros-internal.h
+++ b/shared/nm-utils/nm-macros-internal.h
@@ -605,7 +605,7 @@ NM_G_ERROR_MSG (GError *error)
* argument is not modified (CC), but you want to make it work also
* for "char **". C doesn't allow this form of casting (for good reasons),
* so the function makes a choice like g_strdupv(char**). That means,
- * every time you want to call ith with a const argument, you need to
+ * every time you want to call it with a const argument, you need to
* explicitly cast it.
*
* These macros do the cast, but they only accept a compatible input
@@ -673,7 +673,7 @@ NM_G_ERROR_MSG (GError *error)
/* Beware that this does short-circuit evaluation (use "||" instead of "|")
* which has a possibly unexpected non-function-like behavior.
- * Use NM_IN_SET_SE if you need all arguments to be evaluted. */
+ * Use NM_IN_SET_SE if you need all arguments to be evaluated. */
#define NM_IN_SET(x, ...) _NM_IN_SET(||, typeof (x), x, __VA_ARGS__)
/* "SE" stands for "side-effect". Contrary to NM_IN_SET(), this does not do
@@ -724,7 +724,7 @@ _NM_IN_STRSET_streq (const char *x, const char *s)
/* Beware that this does short-circuit evaluation (use "||" instead of "|")
* which has a possibly unexpected non-function-like behavior.
- * Use NM_IN_STRSET_SE if you need all arguments to be evaluted. */
+ * Use NM_IN_STRSET_SE if you need all arguments to be evaluated. */
#define NM_IN_STRSET(x, ...) _NM_IN_STRSET_EVAL_N(||, x, NM_NARG (__VA_ARGS__), __VA_ARGS__)
/* "SE" stands for "side-effect". Contrary to NM_IN_STRSET(), this does not do
@@ -973,7 +973,7 @@ static inline void
nm_g_object_unref (gpointer obj)
{
/* g_object_unref() doesn't accept NULL. Usully, we workaround that
- * by using g_clear_object(), but sometimes that is not convinient
+ * by using g_clear_object(), but sometimes that is not convenient
* (for example as as destroy function for a hash table that can contain
* NULL values). */
if (obj)
@@ -1433,7 +1433,7 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro)
/**
* The boolean type _Bool is C99 while we mostly stick to C89. However, _Bool is too
- * convinient to miss and is effectively available in gcc and clang. So, just use it.
+ * convenient to miss and is effectively available in gcc and clang. So, just use it.
*
* Usually, one would include "stdbool.h" to get the "bool" define which aliases
* _Bool. We provide this define here, because we want to make use of it anywhere.
@@ -1445,7 +1445,7 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro)
* is a typedef for int). Especially when having boolean fields in a struct, we can
* thereby easily save some space.
*
- * - _Bool type guarantees that two "true" expressions compare equal. E.g. the follwing
+ * - _Bool type guarantees that two "true" expressions compare equal. E.g. the following
* will not work:
* gboolean v1 = 1;
* gboolean v2 = 2;
diff --git a/shared/nm-utils/nm-random-utils.c b/shared/nm-utils/nm-random-utils.c
index 3e968a8eb..d7c7da422 100644
--- a/shared/nm-utils/nm-random-utils.c
+++ b/shared/nm-utils/nm-random-utils.c
@@ -81,7 +81,7 @@ nm_utils_random_bytes (void *p, size_t n)
/* no or partial read. There is not enough entropy.
* Fill the rest reading from urandom, and remember that
- * some bits are not hight quality. */
+ * some bits are not high quality. */
nm_assert (r < n);
buf += r;
n -= r;
diff --git a/shared/nm-utils/nm-shared-utils.c b/shared/nm-utils/nm-shared-utils.c
index 28e3165e2..53da84280 100644
--- a/shared/nm-utils/nm-shared-utils.c
+++ b/shared/nm-utils/nm-shared-utils.c
@@ -118,7 +118,7 @@ nm_utils_strbuf_append (char **buf, gsize *len, const char *format, ...)
/**
* nm_utils_strbuf_seek_end:
* @buf: the input/output buffer
- * @len: the input/output lenght of the buffer.
+ * @len: the input/output length of the buffer.
*
* Commonly, one uses nm_utils_strbuf_append*(), to incrementally
* append strings to the buffer. However, sometimes we need to use