chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs: make btrfs_subvol_snapshot() parameters a flags field
[elogind.git]
/
src
/
shared
/
base-filesystem.c
diff --git
a/src/shared/base-filesystem.c
b/src/shared/base-filesystem.c
index 73907c6354776bc28a18a680d2af6d11b722d5cb..11e09474070effee2a78e66ab5f43e705a317b71 100644
(file)
--- a/
src/shared/base-filesystem.c
+++ b/
src/shared/base-filesystem.c
@@
-22,17
+22,12
@@
#include <errno.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/stat.h>
#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
#include <unistd.h>
#include "base-filesystem.h"
#include "log.h"
#include "macro.h"
#include <unistd.h>
#include "base-filesystem.h"
#include "log.h"
#include "macro.h"
-#include "strv.h"
#include "util.h"
#include "util.h"
-#include "label.h"
-#include "mkdir.h"
typedef struct BaseFilesystem {
const char *dir;
typedef struct BaseFilesystem {
const char *dir;
@@
-55,7
+50,7
@@
static const BaseFilesystem table[] = {
int base_filesystem_create(const char *root) {
_cleanup_close_ int fd = -1;
unsigned i;
int base_filesystem_create(const char *root) {
_cleanup_close_ int fd = -1;
unsigned i;
- int r;
+ int r
= 0
;
fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
if (fd < 0)
fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
if (fd < 0)