chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add set_consume which always takes ownership
[elogind.git]
/
src
/
tmpfiles
/
tmpfiles.c
diff --git
a/src/tmpfiles/tmpfiles.c
b/src/tmpfiles/tmpfiles.c
index 51827f01afdd77fb23c97b5f8e817c75ae1276ca..f4885ec942ec515e9506f5dc6bf60f288d7d99ac 100644
(file)
--- a/
src/tmpfiles/tmpfiles.c
+++ b/
src/tmpfiles/tmpfiles.c
@@
-135,7
+135,7
@@
static struct Item* find_glob(Hashmap *h, const char *match) {
}
static void load_unix_sockets(void) {
}
static void load_unix_sockets(void) {
-
FILE _cleanup_fclose_
*f = NULL;
+
_cleanup_fclose_ FILE
*f = NULL;
char line[LINE_MAX];
if (unix_sockets)
char line[LINE_MAX];
if (unix_sockets)
@@
-186,13
+186,9
@@
static void load_unix_sockets(void) {
path_kill_slashes(s);
path_kill_slashes(s);
- k = set_put(unix_sockets, s);
- if (k < 0) {
- free(s);
-
- if (k != -EEXIST)
- goto fail;
- }
+ k = set_consume(unix_sockets, s);
+ if (k < 0 && k != -EEXIST)
+ goto fail;
}
return;
}
return;
@@
-269,7
+265,7
@@
static int dir_cleanup(
while ((dent = readdir(d))) {
struct stat s;
usec_t age;
while ((dent = readdir(d))) {
struct stat s;
usec_t age;
-
char _cleanup_free_
*sub_path = NULL;
+
_cleanup_free_ char
*sub_path = NULL;
if (streq(dent->d_name, ".") ||
streq(dent->d_name, ".."))
if (streq(dent->d_name, ".") ||
streq(dent->d_name, ".."))
@@
-321,7
+317,7
@@
static int dir_cleanup(
if (maxdepth <= 0)
log_warning("Reached max depth on %s.", sub_path);
else {
if (maxdepth <= 0)
log_warning("Reached max depth on %s.", sub_path);
else {
-
DIR _cleanup_closedir_
*sub_dir;
+
_cleanup_closedir_ DIR
*sub_dir;
int q;
sub_dir = xopendirat(dirfd(d), dent->d_name, O_NOFOLLOW|O_NOATIME);
int q;
sub_dir = xopendirat(dirfd(d), dent->d_name, O_NOFOLLOW|O_NOATIME);
@@
-515,7
+511,7
@@
static int write_one_file(Item *i, const char *path) {
}
static int recursive_relabel_children(Item *i, const char *path) {
}
static int recursive_relabel_children(Item *i, const char *path) {
-
DIR _cleanup_closedir_
*d;
+
_cleanup_closedir_ DIR
*d;
int ret = 0;
/* This returns the first error we run into, but nevertheless
int ret = 0;
/* This returns the first error we run into, but nevertheless
@@
-530,7
+526,7
@@
static int recursive_relabel_children(Item *i, const char *path) {
union dirent_storage buf;
bool is_dir;
int r;
union dirent_storage buf;
bool is_dir;
int r;
-
char _cleanup_free_
*entry_path = NULL;
+
_cleanup_free_ char
*entry_path = NULL;
r = readdir_r(d, &buf.de, &de);
if (r != 0) {
r = readdir_r(d, &buf.de, &de);
if (r != 0) {
@@
-601,12
+597,12
@@
static int recursive_relabel(Item *i, const char *path) {
static int glob_item(Item *i, int (*action)(Item *, const char *)) {
int r = 0, k;
static int glob_item(Item *i, int (*action)(Item *, const char *)) {
int r = 0, k;
- glob_t g = {};
+
_cleanup_globfree_
glob_t g = {};
char **fn;
errno = 0;
char **fn;
errno = 0;
- if ((k = glob(i->path, GLOB_NOSORT|GLOB_BRACE, NULL, &g)) != 0) {
-
+ k = glob(i->path, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
+ if (k != 0)
if (k != GLOB_NOMATCH) {
if (errno > 0)
errno = EIO;
if (k != GLOB_NOMATCH) {
if (errno > 0)
errno = EIO;
@@
-614,13
+610,13
@@
static int glob_item(Item *i, int (*action)(Item *, const char *)) {
log_error("glob(%s) failed: %m", i->path);
return -errno;
}
log_error("glob(%s) failed: %m", i->path);
return -errno;
}
- }
- STRV_FOREACH(fn, g.gl_pathv)
- if ((k = action(i, *fn)) < 0)
+ STRV_FOREACH(fn, g.gl_pathv) {
+ k = action(i, *fn);
+ if (k < 0)
r = k;
r = k;
+ }
- globfree(&g);
return r;
}
return r;
}
@@
-743,7
+739,7
@@
static int create_item(Item *i) {
if (have_effective_cap(CAP_MKNOD) == 0) {
/* In a container we lack CAP_MKNOD. We
if (have_effective_cap(CAP_MKNOD) == 0) {
/* In a container we lack CAP_MKNOD. We
- shouldnt attempt to create the device node in
+ shouldn
'
t attempt to create the device node in
that case to avoid noise, and we don't support
virtualized devices in containers anyway. */
that case to avoid noise, and we don't support
virtualized devices in containers anyway. */
@@
-879,7
+875,7
@@
static int remove_item(Item *i) {
}
static int clean_item_instance(Item *i, const char* instance) {
}
static int clean_item_instance(Item *i, const char* instance) {
-
DIR _cleanup_closedir_
*d = NULL;
+
_cleanup_closedir_ DIR
*d = NULL;
struct stat s, ps;
bool mountpoint;
int r;
struct stat s, ps;
bool mountpoint;
int r;
@@
-1017,9
+1013,9
@@
static bool item_equal(Item *a, Item *b) {
}
static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
static int parse_line(const char *fname, unsigned line, const char *buffer) {
-
Item _cleanup_free_
*i = NULL;
+
_cleanup_free_ Item
*i = NULL;
Item *existing;
Item *existing;
- char _cleanup_free_
+ _cleanup_free_ char
*mode = NULL, *user = NULL, *group = NULL, *age = NULL;
char type;
Hashmap *h;
*mode = NULL, *user = NULL, *group = NULL, *age = NULL;
char type;
Hashmap *h;