[systemd-commits] 2 commits - man/systemd.xml src/libudev src/test units/systemd-journald.socket

[Thomas H.P. Andersen]

 man/systemd.xml               |    2 +-
 src/libudev/libudev-device.c  |    2 +-
 src/test/test-util.c          |   39 +++++++++++++++++++--------------------
 units/systemd-journald.socket |    2 +-
 4 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit 5eec7de6ad91bcfbb2c8dabaf592d0f5151730a7
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Aug 15 23:38:09 2013 +0200

    typo fixes in man and comments

diff --git a/man/systemd.xml b/man/systemd.xml
index 32bca0b..9f58bc2 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -374,7 +374,7 @@
                         <listitem><para>Slice units may be used to
                         group units which manage system processes
                         (such as service and scope units) in a
-                        hierachial tree for resource management
+                        hierarchical tree for resource management
                         purposes. See
                         <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
 
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index eb43668..a644904 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -42,7 +42,7 @@
  *
  * Representation of kernel sys devices. Devices are uniquely identified
  * by their syspath, every device has exactly one path in the kernel sys
- * filesystem. Devices usually belong to a kernel subsystem, and and have
+ * filesystem. Devices usually belong to a kernel subsystem, and have
  * a unique name inside that subsystem.
  */
 
diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index 4f0619d..fbeb10b 100644
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -12,7 +12,7 @@ DefaultDependencies=no
 Before=sockets.target
 
 # Mount and swap units need this. If this socket unit is removed by an
-# isolate request the mount and and swap units would be removed too,
+# isolate request the mount and swap units would be removed too,
 # hence let's exclude this from isolate requests.
 IgnoreOnIsolate=yes
 

commit 998b087f70505decbfe55afd27fc4ade3d60ce52
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Aug 15 23:32:38 2013 +0200

    tests: fix indentation

diff --git a/src/test/test-util.c b/src/test/test-util.c
index 315bc41..875aeab 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -192,41 +192,40 @@ static void test_safe_atod(void) {
 }
 
 static void test_strappend(void) {
-       _cleanup_free_ char *t1, *t2, *t3, *t4;
+        _cleanup_free_ char *t1, *t2, *t3, *t4;
 
-       t1 = strappend(NULL, NULL);
-       assert_se(streq(t1, ""));
+        t1 = strappend(NULL, NULL);
+        assert_se(streq(t1, ""));
 
-       t2 = strappend(NULL, "suf");
-       assert_se(streq(t2, "suf"));
+        t2 = strappend(NULL, "suf");
+        assert_se(streq(t2, "suf"));
 
-       t3 = strappend("pre", NULL);
-       assert_se(streq(t3, "pre"));
+        t3 = strappend("pre", NULL);
+        assert_se(streq(t3, "pre"));
 
-       t4 = strappend("pre", "suf");
-       assert_se(streq(t4, "presuf"));
+        t4 = strappend("pre", "suf");
+        assert_se(streq(t4, "presuf"));
 }
 
 static void test_strstrip(void) {
-       char *r;
-       char input[] = "   hello, waldo.   ";
-
-       r = strstrip(input);
-       assert_se(streq(r, "hello, waldo."));
+        char *r;
+        char input[] = "   hello, waldo.   ";
 
+        r = strstrip(input);
+        assert_se(streq(r, "hello, waldo."));
 }
 
 static void test_delete_chars(void) {
-       char *r;
-       char input[] = "   hello, waldo.   abc";
+        char *r;
+        char input[] = "   hello, waldo.   abc";
 
-       r = delete_chars(input, WHITESPACE);
-       assert_se(streq(r, "hello,waldo.abc"));
+        r = delete_chars(input, WHITESPACE);
+        assert_se(streq(r, "hello,waldo.abc"));
 }
 
 static void test_in_charset(void) {
-      assert_se(in_charset("dddaaabbbcccc", "abcd"));
-      assert_se(!in_charset("dddaaabbbcccc", "abc f"));
+        assert_se(in_charset("dddaaabbbcccc", "abcd"));
+        assert_se(!in_charset("dddaaabbbcccc", "abc f"));
 }
 
 static void test_hexchar(void) {