[systemd-commits] 2 commits - man/systemd.service.xml src/log.c src/logger.c src/mount.c src/notify.c src/util.c src/util.h

[Lennart Poettering]

 man/systemd.service.xml |    2 +-
 src/log.c               |    2 +-
 src/logger.c            |    2 +-
 src/mount.c             |    2 +-
 src/notify.c            |    2 +-
 src/util.c              |   12 ++++++------
 src/util.h              |    2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1bc5d57ae3bd2c49aca3bba10c4ed87c62213e39
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Oct 5 21:52:37 2010 +0200

    notify: fix include properly

diff --git a/src/notify.c b/src/notify.c
index fe33ac0..a9bc51e 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -31,7 +31,7 @@
 #include "util.h"
 #include "log.h"
 #include "sd-daemon.h"
-#include "sd-notify.h"
+#include "sd-readahead.h"
 
 static bool arg_ready = false;
 static pid_t arg_pid = 0;
commit c899f8c61a6f42ec53dbc5645e0ff96c58b2d57a
Author: Dave Reisner <d at falconindy.com>
Date:   Wed Sep 29 09:13:04 2010 -0400

    fix typo: s/seperat/separat/g

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 7fc3205..66806f1 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -307,7 +307,7 @@
                                 the command in
                                 <varname>ExecStart=</varname>. Multiple
                                 command lines may be concatenated in a
-                                single directive, by seperating them
+                                single directive, by separating them
                                 by semicolons (these semicolons must
                                 be passed as separate words). In that
                                 case, the commands are executed one
diff --git a/src/log.c b/src/log.c
index 2dd3e97..d82747e 100644
--- a/src/log.c
+++ b/src/log.c
@@ -300,7 +300,7 @@ static int write_to_syslog(
         IOVEC_SET_STRING(iovec[3], header_pid);
         IOVEC_SET_STRING(iovec[4], buffer);
 
-        /* When using syslog via SOCK_STREAM seperate the messages by NUL chars */
+        /* When using syslog via SOCK_STREAM separate the messages by NUL chars */
         if (syslog_is_stream)
                 iovec[4].iov_len++;
 
diff --git a/src/logger.c b/src/logger.c
index 9d67ab6..9c3cb1a 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -174,7 +174,7 @@ static int stream_log(Stream *s, char *p, usec_t ts) {
                 IOVEC_SET_STRING(iovec[3], header_pid);
                 IOVEC_SET_STRING(iovec[4], p);
 
-                /* When using syslog via SOCK_STREAM seperate the messages by NUL chars */
+                /* When using syslog via SOCK_STREAM separate the messages by NUL chars */
                 if (s->server->syslog_is_stream)
                         iovec[4].iov_len++;
 
diff --git a/src/mount.c b/src/mount.c
index fd77516..b17fe2a 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -1427,7 +1427,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
                                 "%ms "       /* (5) mount point */
                                 "%ms"        /* (6) mount options */
                                 "%*[^-]"     /* (7) optional fields */
-                                "- "         /* (8) seperator */
+                                "- "         /* (8) separator */
                                 "%ms "       /* (9) file system type */
                                 "%ms"        /* (10) mount source */
                                 "%ms"        /* (11) mount options 2 */
diff --git a/src/util.c b/src/util.c
index ce8695b..98dbe28 100644
--- a/src/util.c
+++ b/src/util.c
@@ -600,13 +600,13 @@ finish:
 
 int parse_env_file(
                 const char *fname,
-                const char *seperator, ...) {
+                const char *separator, ...) {
 
         int r = 0;
         char *contents, *p;
 
         assert(fname);
-        assert(seperator);
+        assert(separator);
 
         if ((r = read_full_file(fname, &contents)) < 0)
                 return r;
@@ -615,7 +615,7 @@ int parse_env_file(
         for (;;) {
                 const char *key = NULL;
 
-                p += strspn(p, seperator);
+                p += strspn(p, separator);
                 p += strspn(p, WHITESPACE);
 
                 if (!*p)
@@ -625,7 +625,7 @@ int parse_env_file(
                         va_list ap;
                         char **value;
 
-                        va_start(ap, seperator);
+                        va_start(ap, separator);
                         while ((key = va_arg(ap, char *))) {
                                 size_t n;
                                 char *v;
@@ -638,7 +638,7 @@ int parse_env_file(
                                         continue;
 
                                 p += n + 1;
-                                n = strcspn(p, seperator);
+                                n = strcspn(p, separator);
 
                                 if (n >= 2 &&
                                     strchr(QUOTES, p[0]) &&
@@ -671,7 +671,7 @@ int parse_env_file(
                 }
 
                 if (!key)
-                        p += strcspn(p, seperator);
+                        p += strcspn(p, separator);
         }
 
 fail:
diff --git a/src/util.h b/src/util.h
index ae00ff5..f21aecf 100644
--- a/src/util.h
+++ b/src/util.h
@@ -191,7 +191,7 @@ int write_one_line_file(const char *fn, const char *line);
 int read_one_line_file(const char *fn, char **line);
 int read_full_file(const char *fn, char **contents);
 
-int parse_env_file(const char *fname, const char *seperator, ...) _sentinel_;
+int parse_env_file(const char *fname, const char *separator, ...) _sentinel_;
 
 char *strappend(const char *s, const char *suffix);
 char *strnappend(const char *s, const char *suffix, size_t length);