diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-31 12:40:07 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-31 12:40:07 +0000 |
| commit | 42b55068b1b61e12a8753f95e8160e5cf573867b (patch) | |
| tree | 2c20199964e61b9268715a6e1a25f53ba1deb9af /usr/src/lib/libbe/common/be_utils.c | |
| parent | 4bf87f0f9a9dec4e46764fe7c2c7c342fe2f32d9 (diff) | |
| parent | d75f3745ad3c36431063bb316666f4d316eabc8c (diff) | |
| download | illumos-joyent-42b55068b1b61e12a8753f95e8160e5cf573867b.tar.gz | |
[illumos-gate merge]
commit d75f3745ad3c36431063bb316666f4d316eabc8c
10132 smatch fixes for MDB
commit 9850293dd7e478722798fcf0c1e690339cd94590
10129 smatch fix for dtrace tests
commit 19e768cea9f86f85e2ac5e7346c007a7f201e154
10126 smatch fix for kmfcfg
commit ce829a5100fdc22aacaa0a61badfc9d23d0cd505
10117 libbe needs smatch fixes
commit be60bf2c542df8faac21eb9afc320967fc43ab20
10105 libproject needs smatch fixes
Diffstat (limited to 'usr/src/lib/libbe/common/be_utils.c')
| -rw-r--r-- | usr/src/lib/libbe/common/be_utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/lib/libbe/common/be_utils.c b/usr/src/lib/libbe/common/be_utils.c index b29120c824..73eb416043 100644 --- a/usr/src/lib/libbe/common/be_utils.c +++ b/usr/src/lib/libbe/common/be_utils.c @@ -25,6 +25,7 @@ * Copyright 2016 Toomas Soome <tsoome@me.com> * Copyright (c) 2015 by Delphix. All rights reserved. * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. + * Copyright (c) 2018, Joyent, Inc. */ @@ -270,7 +271,7 @@ be_get_boot_args(char **fbarg, int entry) "-B zfs-bootfs=%s,bootpath=\"%s\"\n", kernel, kernel_options, node->be_root_ds, tmp); - if (fbarg == NULL) + if (*fbarg == NULL) ret = BE_ERR_NOMEM; else ret = 0; @@ -3908,9 +3909,9 @@ be_create_menu( if (mkdirp(menu_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1 && errno != EEXIST) { - free(menu_path); be_print_err(gettext("be_create_menu: Failed to create the %s " "directory: %s\n"), menu_path, strerror(errno)); + free(menu_path); return (errno_to_be_err(errno)); } free(menu_path); |