[systemd-commits] 4 commits - src/core src/journal-remote src/sysusers

[Tom Gundersen]

 src/core/bus-endpoint.c             |    4 ++--
 src/core/mount.c                    |    8 ++++----
 src/journal-remote/journal-upload.c |    2 +-
 src/sysusers/sysusers.c             |    4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 56d21cdebce3ecd3b06189cb2184a84ba909619f
Author: Philippe De Swert <philippedeswert at gmail.com>
Date:   Thu Sep 18 18:56:57 2014 +0300

    sysusers: Remove some gcc warnings about uninitialized variables
    
    Gcc is spewing some warnings about uninitialized variables.
    Let's get rid of the noise.

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index ba20d94..4203b3e 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -796,8 +796,8 @@ static int root_stat(const char *p, struct stat *st) {
 static int read_id_from_file(Item *i, uid_t *_uid, gid_t *_gid) {
         struct stat st;
         bool found_uid = false, found_gid = false;
-        uid_t uid;
-        gid_t gid;
+        uid_t uid = 0;
+        gid_t gid = 0;
 
         assert(i);
 

commit 96f2f3b1b5f44eb59d23d2abeac12b33a18e1e21
Author: Philippe De Swert <philippedeswert at gmail.com>
Date:   Thu Sep 18 18:56:56 2014 +0300

    core: Remove uninitialized warnings from bus-endpoint.c
    
    Gcc is spewing some warnings about uninitialized variables.
    Let's get rid of the noise.

diff --git a/src/core/bus-endpoint.c b/src/core/bus-endpoint.c
index 1e8f07e..aac540d 100644
--- a/src/core/bus-endpoint.c
+++ b/src/core/bus-endpoint.c
@@ -34,8 +34,8 @@ int bus_endpoint_new(BusEndpoint **ep)
 
 int bus_endpoint_add_policy(BusEndpoint *ep, const char *name, BusPolicyAccess access)
 {
-        _cleanup_free_ BusEndpointPolicy *po;
-        _cleanup_free_ char *key;
+        _cleanup_free_ BusEndpointPolicy *po = NULL;
+        _cleanup_free_ char *key = NULL;
         int r;
 
         assert(ep);

commit b88a40a7e592e0a4a2e6e8eb1ed3721989ba5d0e
Author: Philippe De Swert <philippedeswert at gmail.com>
Date:   Thu Sep 18 18:56:55 2014 +0300

    journal-upload: Remove compilation warning
    
    When compiling we see this curl warning popping up:
    src/journal-remote/journal-upload.c:194:17: warning: call to
    ‘_curl_easy_setopt_err_error_buffer’ declared with attribute
    warning: curl_easy_setopt expects a char buffer of CURL_ERROR_SIZE
    as argument for this option [enabled by default]
    This patch removes the warning (which occurs twice).

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 40c380a..e162044 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -191,7 +191,7 @@ int start_upload(Uploader *u,
                 easy_setopt(curl, CURLOPT_POST, 1L,
                             LOG_ERR, return -EXFULL);
 
-                easy_setopt(curl, CURLOPT_ERRORBUFFER, &u->error,
+                easy_setopt(curl, CURLOPT_ERRORBUFFER, u->error,
                             LOG_ERR, return -EXFULL);
 
                 /* set where to write to */

commit 141a1ceaa62578f1ed14f04cae2113dd0f49fd7f
Author: Emil Renner Berthing <systemd at esmil.dk>
Date:   Thu Sep 18 15:24:59 2014 +0200

    mount: order options before other arguments to mount

diff --git a/src/core/mount.c b/src/core/mount.c
index e284357..f3ec736 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -903,10 +903,10 @@ static void mount_enter_mounting(Mount *m) {
                                 m->control_command,
                                 "/bin/mount",
                                 m->sloppy_options ? "-ns" : "-n",
+                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
+                                "-o", m->parameters_fragment.options ? m->parameters_fragment.options : "",
                                 m->parameters_fragment.what,
                                 m->where,
-                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
-                                m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options,
                                 NULL);
         else
                 r = -ENOENT;
@@ -951,10 +951,10 @@ static void mount_enter_remounting(Mount *m) {
                                 m->control_command,
                                 "/bin/mount",
                                 m->sloppy_options ? "-ns" : "-n",
-                                m->parameters_fragment.what,
-                                m->where,
                                 "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
                                 "-o", o,
+                                m->parameters_fragment.what,
+                                m->where,
                                 NULL);
         } else
                 r = -ENOENT;