diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-03 22:24:51 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-03 22:24:51 +0200 |
| commit | 6aab9928dec29855bcee21bce163e5fdf7144350 (patch) | |
| tree | 39cfa4f508f208ae093fefcd8b865a0cb36547e2 | |
| parent | b068cf2a7e036da8d0b3533b41886c5605c8139d (diff) | |
whitespace and namespace cleanups
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | libbb/ubi.c | 8 | ||||
| -rw-r--r-- | miscutils/ubi_tools.c | 2 | ||||
| -rw-r--r-- | miscutils/ubirename.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/libbb.h b/include/libbb.h index 35c28df51..111dd66e0 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -1771,7 +1771,7 @@ void bb_progress_update(bb_progress_t *p, uoff_t totalsize) FAST_FUNC; unsigned ubi_devnum_from_devname(const char *str) FAST_FUNC; -int get_volid_by_name(unsigned ubi_devnum, const char *vol_name) FAST_FUNC; +int ubi_get_volid_by_name(unsigned ubi_devnum, const char *vol_name) FAST_FUNC; extern const char *applet_name; diff --git a/libbb/ubi.c b/libbb/ubi.c index 7d3b2952d..34595d797 100644 --- a/libbb/ubi.c +++ b/libbb/ubi.c @@ -16,14 +16,14 @@ unsigned FAST_FUNC ubi_devnum_from_devname(const char *str) { - unsigned ubi_devnum; + unsigned ubi_devnum; - if (sscanf(str, "/dev/ubi%u", &ubi_devnum) != 1) - bb_error_msg_and_die("not an UBI device: '%s'", str); + if (sscanf(str, "/dev/ubi%u", &ubi_devnum) != 1) + bb_error_msg_and_die("not an UBI device: '%s'", str); return ubi_devnum; } -int FAST_FUNC get_volid_by_name(unsigned ubi_devnum, const char *vol_name) +int FAST_FUNC ubi_get_volid_by_name(unsigned ubi_devnum, const char *vol_name) { unsigned i; 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]); |