chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove duplicated includes
[elogind.git]
/
src
/
shared
/
fstab-util.c
diff --git
a/src/shared/fstab-util.c
b/src/shared/fstab-util.c
index a886f6a5dadd0e3a8a0665e81c3c4289fec750e2..cf317e17bda65759c5ff7ac8fe59181dec85625d 100644
(file)
--- a/
src/shared/fstab-util.c
+++ b/
src/shared/fstab-util.c
@@
-133,8
+133,10
@@
int fstab_find_pri(const char *options, int *ret) {
assert(ret);
r = fstab_filter_options(options, "pri\0", NULL, &opt, NULL);
assert(ret);
r = fstab_filter_options(options, "pri\0", NULL, &opt, NULL);
- if (r <
=
0)
+ if (r < 0)
return r;
return r;
+ if (r == 0 || !opt)
+ return 0;
r = safe_atou(opt, &pri);
if (r < 0)
r = safe_atou(opt, &pri);
if (r < 0)
@@
-143,6
+145,6
@@
int fstab_find_pri(const char *options, int *ret) {
if ((int) pri < 0)
return -ERANGE;
if ((int) pri < 0)
return -ERANGE;
- *ret = (int)
r
;
+ *ret = (int)
pri
;
return 1;
}
return 1;
}