summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenys Vlasenko2017-08-07 02:55:33 +0200
committerDenys Vlasenko2017-08-07 02:55:33 +0200
commit115e0a719950f8f716f73d5e36e9483df9dbbf1e (patch)
tree8606214e5ebf11461e75501f1bc6314b42016df3 /miscutils
parent4dea1edd08a45c5987448719e56ee61a20fb9210 (diff)
downloadbusybox-115e0a719950f8f716f73d5e36e9483df9dbbf1e.zip
busybox-115e0a719950f8f716f73d5e36e9483df9dbbf1e.tar.gz
ubi_tools: a bit smaller applet resolution code
function old new delta ubi_tools_main 1241 1235 -6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/ubi_tools.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index c6ba22a..d9b76b6 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -67,12 +67,21 @@
#endif
#include <mtd/ubi-user.h>
-#define do_attach (ENABLE_UBIATTACH && applet_name[3] == 'a')
-#define do_detach (ENABLE_UBIDETACH && applet_name[3] == 'd')
-#define do_mkvol (ENABLE_UBIMKVOL && applet_name[3] == 'm')
-#define do_rmvol (ENABLE_UBIRMVOL && applet_name[4] == 'm')
-#define do_rsvol (ENABLE_UBIRSVOL && applet_name[4] == 's')
-#define do_update (ENABLE_UBIUPDATEVOL && applet_name[3] == 'u')
+#define UBI_APPLET_CNT (0 \
+ + ENABLE_UBIATTACH \
+ + ENABLE_UBIDETACH \
+ + ENABLE_UBIMKVOL \
+ + ENABLE_UBIRMVOL \
+ + ENABLE_UBIRSVOL \
+ + ENABLE_UBIUPDATEVOL \
+ )
+
+#define do_attach (ENABLE_UBIATTACH && (UBI_APPLET_CNT == 1 || applet_name[4] == 't'))
+#define do_detach (ENABLE_UBIDETACH && (UBI_APPLET_CNT == 1 || applet_name[4] == 'e'))
+#define do_mkvol (ENABLE_UBIMKVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 'k'))
+#define do_rmvol (ENABLE_UBIRMVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 'm'))
+#define do_rsvol (ENABLE_UBIRSVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 's'))
+#define do_update (ENABLE_UBIUPDATEVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 'p'))
static unsigned get_num_from_file(const char *path, unsigned max, const char *errmsg)
{