ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libmount: cleanup return codes in mount sample 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2011-06-23 15:19:37 +02:00
parent 9f7472b0b8
commit 117545721a
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libmount/samples/mount.c
View File

@ -98,23 +98,19 @@ static const char *opt_to_longopt(int c, const struct option *opts)
return NULL; return NULL;
} }
static int print_all(struct libmnt_context *cxt, char *pattern, int show_label) static void print_all(struct libmnt_context *cxt, char *pattern, int show_label)
{ {
int rc = 0;
struct libmnt_table *tb; struct libmnt_table *tb;
struct libmnt_iter *itr = NULL; struct libmnt_iter *itr = NULL;
struct libmnt_fs *fs; struct libmnt_fs *fs;
struct libmnt_cache *cache = NULL; struct libmnt_cache *cache = NULL;
rc = mnt_context_get_mtab(cxt, &tb); if (mnt_context_get_mtab(cxt, &tb))
if (rc) err(EX_SYSERR, _("failed to read mtab"));
goto done;
itr = mnt_new_iter(MNT_ITER_FORWARD); itr = mnt_new_iter(MNT_ITER_FORWARD);
if (!itr) { if (!itr)
warn(_("failed to initialize libmount iterator")); err(EX_SYSERR, _("failed to initialize libmount iterator"));
goto done;
}
if (show_label) if (show_label)
cache = mnt_new_cache(); cache = mnt_new_cache();
@ -140,10 +136,9 @@ static int print_all(struct libmnt_context *cxt, char *pattern, int show_label)
} }
fputc('\n', stdout); fputc('\n', stdout);
} }
done:
mnt_free_cache(cache); mnt_free_cache(cache);
mnt_free_iter(itr); mnt_free_iter(itr);
return rc;
} }
/* /*
@ -251,7 +246,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int c, rc = EXIT_FAILURE, all = 0, forkme = 0, show_labels = 0; int c, rc = EX_SUCCESS, all = 0, forkme = 0, show_labels = 0;
struct libmnt_context *cxt; struct libmnt_context *cxt;
char *source = NULL, *srcbuf = NULL; char *source = NULL, *srcbuf = NULL;
char *types = NULL; char *types = NULL;
@ -416,8 +411,7 @@ int main(int argc, char **argv)
if (!source && !argc && !all) { if (!source && !argc && !all) {
if (oper) if (oper)
usage(stderr); usage(stderr);
if (!print_all(cxt, types, show_labels)) print_all(cxt, types, show_labels);
rc = EX_SUCCESS;
goto done; goto done;
} }
@ -435,8 +429,7 @@ int main(int argc, char **argv)
* A) Mount all * A) Mount all
*/ */
rc = mount_all(cxt, forkme); rc = mount_all(cxt, forkme);
mnt_free_context(cxt); goto done;
return rc;
} else if (argc == 0 && source) { } else if (argc == 0 && source) {
/* /*
@ -471,8 +464,6 @@ int main(int argc, char **argv)
mnt_context_set_mflags(cxt, oper); mnt_context_set_mflags(cxt, oper);
rc = mnt_context_mount(cxt); rc = mnt_context_mount(cxt);
rc = rc ? EX_FAIL : EX_SUCCESS;
if (rc) { if (rc) {
/* TODO: call mnt_context_strerror() */ /* TODO: call mnt_context_strerror() */
rc = EX_FAIL; rc = EX_FAIL;