[systemd-commits] 2 commits - man/systemd-delta.xml src/delta src/journal src/udev

Thomas H.P. Andersen phomes at kemper.freedesktop.org
Mon Nov 12 13:38:52 PST 2012


 man/systemd-delta.xml           |    3 ++-
 src/delta/delta.c               |    2 +-
 src/journal/journal-gatewayd.c  |    4 ++--
 src/udev/udev-builtin-path_id.c |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 33b40551236a6c0c323226b78f1b1e5751a95ff5
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Mon Nov 12 22:37:20 2012 +0100

    remove duplicate semicolons

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 803d2a7..494e82e 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -308,7 +308,7 @@ static int process_suffix_chop(const char *prefixes, const char *suffix) {
         /* Strip prefix from the suffix */
         NULSTR_FOREACH(p, prefixes) {
                 if (startswith(suffix, p)) {
-                        suffix += strlen(p);;
+                        suffix += strlen(p);
                         suffix += strspn(suffix, "/");
                         return process_suffix(prefixes, suffix);
                 }
diff --git a/src/journal/journal-gatewayd.c b/src/journal/journal-gatewayd.c
index 6a5db96..3546279 100644
--- a/src/journal/journal-gatewayd.c
+++ b/src/journal/journal-gatewayd.c
@@ -237,7 +237,7 @@ static ssize_t request_reader_entries(
                         m->tmp = tmpfile();
                         if (!m->tmp) {
                                 log_error("Failed to create temporary file: %m");
-                                return MHD_CONTENT_READER_END_WITH_ERROR;;
+                                return MHD_CONTENT_READER_END_WITH_ERROR;
                         }
                 }
 
@@ -603,7 +603,7 @@ static ssize_t request_reader_fields(
                         m->tmp = tmpfile();
                         if (!m->tmp) {
                                 log_error("Failed to create temporary file: %m");
-                                return MHD_CONTENT_READER_END_WITH_ERROR;;
+                                return MHD_CONTENT_READER_END_WITH_ERROR;
                         }
                 }
 
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index cbdeb38..bfdedc0 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -97,7 +97,7 @@ static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent,
         struct udev_device *targetdev;
         struct udev_device *fcdev = NULL;
         const char *port;
-        char *lun = NULL;;
+        char *lun = NULL;
 
         targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_target");
         if (targetdev == NULL)

commit 0c77310d3950d9577f6a8bcc5b5529624d230da2
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Mon Nov 12 22:34:47 2012 +0100

    systemd-delta.xml: document default value for --diff

diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index c66d7e8..072f55f 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -156,7 +156,8 @@
                                 <listitem><para>When showing modified
                                 files, when a file is overridden show a
                                 diff as well. This option takes a
-                                boolean argument.</para></listitem>
+                                boolean argument. If omitted it defaults
+                                to <option>true</option>.</para></listitem>
                         </varlistentry>
 
                 </variablelist>



More information about the systemd-commits mailing list