[systemd-devel] [PATCH] Assorted typo fixes

Rémi Audebert halfr at lse.epita.fr
Mon Jan 19 01:46:23 PST 2015


Signed-off-by: Rémi Audebert <halfr at lse.epita.fr>
---
 kdbus.txt              | 6 +++---
 match.c                | 2 +-
 pool.c                 | 2 +-
 queue.c                | 4 ++--
 test/kdbus-util.c      | 2 +-
 test/test-connection.c | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kdbus.txt b/kdbus.txt
index 2592a7e..b2392ea 100644
--- a/kdbus.txt
+++ b/kdbus.txt
@@ -864,7 +864,7 @@ struct kdbus_msg {
 
     KDBUS_MSG_NO_AUTO_START
       By default, when a message is sent to an activator connection, the
-      activator notified and will start an implementer. This flag inhibits
+      activator is notified and will start an implementer. This flag inhibits
       that behavior. With this bit set, and the remote being an activator,
       -EADDRNOTAVAIL is returned from the ioctl.
 
@@ -2010,7 +2010,7 @@ For KDBUS_CMD_NAME_ACQUIRE:
 For KDBUS_CMD_NAME_RELEASE:
 
   -EINVAL	Invalid command flags, or invalid name provided
-  -ESRCH	Name is not found found in the registry
+  -ESRCH	Name is not found in the registry
   -EADDRINUSE	Name is owned by a different connection and can't be released
 
 For KDBUS_CMD_NAME_LIST:
@@ -2057,7 +2057,7 @@ For KDBUS_CMD_MATCH_REMOVE:
 This is a simplified outline of the internal kdbus object relations, for
 those interested in the inner life of the driver implementation.
 
-From the a mount point's (domain's) perspective:
+From a mount point's (domain's) perspective:
 
 struct kdbus_domain
   |» struct kdbus_domain_user *user (many, owned)
diff --git a/match.c b/match.c
index d4f2184..aae9a85 100644
--- a/match.c
+++ b/match.c
@@ -356,7 +356,7 @@ static int kdbus_match_db_remove_unlocked(struct kdbus_match_db *mdb,
  *				kdbus_notify_id_change
  *
  * For kdbus_notify_{id,name}_change structs, only the ID and name fields
- * are looked at at when adding an entry. The flags are unused.
+ * are looked at when adding an entry. The flags are unused.
  *
  * Also note that KDBUS_ITEM_BLOOM_MASK, KDBUS_ITEM_NAME and KDBUS_ITEM_ID
  * are used to match messages from userspace, while the others apply to
diff --git a/pool.c b/pool.c
index 1fff68d..44667dd 100644
--- a/pool.c
+++ b/pool.c
@@ -346,7 +346,7 @@ static void __kdbus_pool_slice_release(struct kdbus_pool_slice *slice)
 
 /**
  * kdbus_pool_slice_release() - drop kernel-reference on allocated slice
- * @slice:		Slice allocated from the the pool
+ * @slice:		Slice allocated from the pool
  *
  * This releases the kernel-reference on the given slice. If the
  * kernel-reference and the user-reference on a slice are dropped, the slice is
diff --git a/queue.c b/queue.c
index 53ab51a..04e010b 100644
--- a/queue.c
+++ b/queue.c
@@ -401,8 +401,8 @@ int kdbus_queue_entry_install(struct kdbus_queue_entry *entry,
 	}
 
 	/*
-	 * The offsets stored in the slice are relative to the the start
-	 * of the payload slice. When exporting them, they need to become
+	 * The offsets stored in the slice are relative to the start of
+	 * the payload slice. When exporting them, they need to become
 	 * relative to the pool, so get the payload slice's offset first.
 	 */
 	if (entry->slice_vecs)
diff --git a/test/kdbus-util.c b/test/kdbus-util.c
index 264d7ab..4a57c95 100644
--- a/test/kdbus-util.c
+++ b/test/kdbus-util.c
@@ -1184,7 +1184,7 @@ int kdbus_name_list(struct kdbus_conn *conn, uint64_t flags)
 			}
 
 		kdbus_printf("%8llu flags=0x%08llx conn=0x%08llx '%s'\n",
-			     name->owner_id, (unsigned long long )flags,
+			     name->owner_id, (unsigned long long) flags,
 			     name->conn_flags, n);
 	}
 	kdbus_printf("\n");
diff --git a/test/test-connection.c b/test/test-connection.c
index db19b81..c2ae653 100644
--- a/test/test-connection.c
+++ b/test/test-connection.c
@@ -75,8 +75,8 @@ int kdbus_test_hello(struct kdbus_test_env *env)
 
 	/*
 	 * The connection created by the core requires ALL meta flags
-	 * to be sent. An attempt to send less that that should result
-	 * in -ECONNREFUSED.
+	 * to be sent. An attempt to send less than that should result in
+	 * -ECONNREFUSED.
 	 */
 	hello.attach_flags_send = _KDBUS_ATTACH_ALL & ~KDBUS_ATTACH_TIMESTAMP;
 	ret = ioctl(fd, KDBUS_CMD_HELLO, &hello);
-- 
2.2.1



More information about the systemd-devel mailing list