emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whitespace and namespace cleanups

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-04-03 22:24:51 +02:00
parent b068cf2a7e
commit 6aab9928de
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -1771,7 +1771,7 @@ void bb_progress_update(bb_progress_t *p,
uoff_t totalsize) FAST_FUNC; uoff_t totalsize) FAST_FUNC;
unsigned ubi_devnum_from_devname(const char *str) 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; extern const char *applet_name;

8
libbb/ubi.c
View File

@ -16,14 +16,14 @@
unsigned FAST_FUNC ubi_devnum_from_devname(const char *str) 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) if (sscanf(str, "/dev/ubi%u", &ubi_devnum) != 1)
bb_error_msg_and_die("not an UBI device: '%s'", str); bb_error_msg_and_die("not an UBI device: '%s'", str);
return ubi_devnum; 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; unsigned i;

2
miscutils/ubi_tools.c
View File

@ -257,7 +257,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
if (opts & OPTION_N) { if (opts & OPTION_N) {
unsigned num = ubi_devnum_from_devname(ubi_ctrl); 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) { if (sizeof(vol_id) != 4) {

4
miscutils/ubirename.c
View File

@ -31,7 +31,7 @@
// from ubi-media.h // from ubi-media.h
#define UBI_MAX_VOLUME_NAME 127 #define UBI_MAX_VOLUME_NAME 127
#define UBI_MAX_VOLUMES 128 #define UBI_MAX_VOLUMES 128
// end ubi-media.h // end ubi-media.h
// from ubi-user.h // from ubi-user.h
@ -79,7 +79,7 @@ int ubirename_main(int argc, char **argv)
n = 0; n = 0;
argv += 2; argv += 2;
while (argv[0]) { 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]); rnvol->ents[n].name_len = strlen(argv[1]);
if (rnvol->ents[n].name_len >= sizeof(rnvol->ents[n].name)) if (rnvol->ents[n].name_len >= sizeof(rnvol->ents[n].name))
bb_error_msg_and_die("new name '%s' is too long", argv[1]); bb_error_msg_and_die("new name '%s' is too long", argv[1]);