summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-29 16:03:32 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-29 16:03:32 +0100
commit0522e11f59482e051dcdaff47ab05a781c8447a0 (patch)
treede3cbb69c5088bad5ca76c3cc51dc06e6bbdea1d /src/basic
parent450e89f6b1e1e3c4d86239287b4049d891da93cb (diff)
parent3587161ade40a4f093175217d87d6323b3aba168 (diff)
Merge pull request #2756 from thom311/master
core: avoid compiler warning when compiling with -fexceptions
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/fileio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 2c454e8ea2..69590941e5 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -588,7 +588,7 @@ static int parse_env_file_push(
va_list aq, *ap = userdata;
if (!utf8_is_valid(key)) {
- _cleanup_free_ char *p;
+ _cleanup_free_ char *p = NULL;
p = utf8_escape_invalid(key);
log_error("%s:%u: invalid UTF-8 in key '%s', ignoring.", strna(filename), line, p);
@@ -596,7 +596,7 @@ static int parse_env_file_push(
}
if (value && !utf8_is_valid(value)) {
- _cleanup_free_ char *p;
+ _cleanup_free_ char *p = NULL;
p = utf8_escape_invalid(value);
log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.", strna(filename), line, key, p);
@@ -1069,7 +1069,7 @@ int fflush_and_check(FILE *f) {
/* This is much like like mkostemp() but is subject to umask(). */
int mkostemp_safe(char *pattern, int flags) {
- _cleanup_umask_ mode_t u;
+ _cleanup_umask_ mode_t u = 0;
int fd;
assert(pattern);