From 6aab9928dec29855bcee21bce163e5fdf7144350 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 3 Apr 2016 22:24:51 +0200 Subject: whitespace and namespace cleanups Signed-off-by: Denys Vlasenko --- miscutils/ubi_tools.c | 2 +- miscutils/ubirename.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'miscutils') diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c index ac0c56d6b..4364bc807 100644 --- a/miscutils/ubi_tools.c +++ b/miscutils/ubi_tools.c @@ -257,7 +257,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv) if (opts & OPTION_N) { unsigned num = ubi_devnum_from_devname(ubi_ctrl); - vol_id = get_volid_by_name(num, vol_name); + vol_id = ubi_get_volid_by_name(num, vol_name); } if (sizeof(vol_id) != 4) { diff --git a/miscutils/ubirename.c b/miscutils/ubirename.c index d6ccfcb10..8b1c3785a 100644 --- a/miscutils/ubirename.c +++ b/miscutils/ubirename.c @@ -31,7 +31,7 @@ // from ubi-media.h #define UBI_MAX_VOLUME_NAME 127 -#define UBI_MAX_VOLUMES 128 +#define UBI_MAX_VOLUMES 128 // end ubi-media.h // from ubi-user.h @@ -79,7 +79,7 @@ int ubirename_main(int argc, char **argv) n = 0; argv += 2; while (argv[0]) { - rnvol->ents[n].vol_id = get_volid_by_name(ubi_devnum, argv[0]); + rnvol->ents[n].vol_id = ubi_get_volid_by_name(ubi_devnum, argv[0]); rnvol->ents[n].name_len = strlen(argv[1]); if (rnvol->ents[n].name_len >= sizeof(rnvol->ents[n].name)) bb_error_msg_and_die("new name '%s' is too long", argv[1]); -- cgit v1.2.3