chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce _cleanup_endmntent_
[elogind.git]
/
src
/
fstab-generator
/
fstab-generator.c
diff --git
a/src/fstab-generator/fstab-generator.c
b/src/fstab-generator/fstab-generator.c
index b73dfa4899ee65d137915c8468cbc42cd83dd744..9e7d55d177650e1a4f2642013dd0ac10d2eafc35 100644
(file)
--- a/
src/fstab-generator/fstab-generator.c
+++ b/
src/fstab-generator/fstab-generator.c
@@
-64,7
+64,7
@@
static int mount_find_pri(struct mntent *me, int *ret) {
}
static int add_swap(const char *what, struct mntent *me) {
}
static int add_swap(const char *what, struct mntent *me) {
- _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL
, *device = NULL
;
+ _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
_cleanup_fclose_ FILE *f = NULL;
bool noauto;
int r, pri = -1;
_cleanup_fclose_ FILE *f = NULL;
bool noauto;
int r, pri = -1;
@@
-159,7
+159,7
@@
static int add_mount(
const char *post,
const char *source) {
_cleanup_free_ char
const char *post,
const char *source) {
_cleanup_free_ char
- *name = NULL, *unit = NULL, *lnk = NULL,
*device = NULL,
+ *name = NULL, *unit = NULL, *lnk = NULL,
*automount_name = NULL, *automount_unit = NULL;
_cleanup_fclose_ FILE *f = NULL;
*automount_name = NULL, *automount_unit = NULL;
_cleanup_fclose_ FILE *f = NULL;
@@
-301,15
+301,12
@@
static int add_mount(
}
static int parse_fstab(const char *prefix, bool initrd) {
}
static int parse_fstab(const char *prefix, bool initrd) {
-
_cleanup_free_ char *fstab_path = NULL
;
- FILE *f;
+
char *fstab_path
;
+
_cleanup_endmntent_
FILE *f;
int r = 0;
struct mntent *me;
int r = 0;
struct mntent *me;
- fstab_path = strjoin(strempty(prefix), "/etc/fstab", NULL);
- if (!fstab_path)
- return log_oom();
-
+ fstab_path = strappenda(strempty(prefix), "/etc/fstab");
f = setmntent(fstab_path, "r");
if (!f) {
if (errno == ENOENT)
f = setmntent(fstab_path, "r");
if (!f) {
if (errno == ENOENT)
@@
-328,10
+325,8
@@
static int parse_fstab(const char *prefix, bool initrd) {
what = fstab_node_to_udev_node(me->mnt_fsname);
where = strjoin(strempty(prefix), me->mnt_dir, NULL);
what = fstab_node_to_udev_node(me->mnt_fsname);
where = strjoin(strempty(prefix), me->mnt_dir, NULL);
- if (!what || !where) {
- r = log_oom();
- goto finish;
- }
+ if (!what || !where)
+ return log_oom();
if (is_path(where))
path_kill_slashes(where);
if (is_path(where))
path_kill_slashes(where);
@@
-369,8
+364,6
@@
static int parse_fstab(const char *prefix, bool initrd) {
r = k;
}
r = k;
}
-finish:
- endmntent(f);
return r;
}
return r;
}