aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2013-09-27 13:39:41 +0200
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2013-11-08 09:05:25 +0100
commitb541d1fcbd39f9fa8768a57e48a334b1929303e5 (patch)
tree5271b56b38229b283497d53a997b0a3f502c1c33
parent8d3efaf35eb9d138114563bba4173c39c1231198 (diff)
downloadbusybox-b541d1fcbd39f9fa8768a57e48a334b1929303e5.tar.gz
swaponoff: shrink
function old new delta .rodata 148469 148468 -1 swap_on_off_main 381 379 -2 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-3) Total: -3 bytes text data bss dec hex filename 803030 4090 9504 816624 c75f0 busybox_old 803027 4090 9504 816621 c75ed busybox_unstripped
-rw-r--r--util-linux/swaponoff.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index afad4ab8f..40f971d35 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -96,12 +96,11 @@ static int do_em_all(void)
|| hasmntopt(m, MNTOPT_NOAUTO) == NULL
) {
#if ENABLE_FEATURE_SWAPON_PRI
- char *p;
g_flags = 0; /* each swap space might have different flags */
- p = strstr(m->mnt_opts, "pri=");
+ char *p = hasmntopt(m,"pri");
if (p) {
/* Max allowed 32767 (==SWAP_FLAG_PRIO_MASK) */
- int swap_prio = MIN(bb_strtoull(p + 4 , NULL, 10), SWAP_FLAG_PRIO_MASK);
+ unsigned int swap_prio = MIN(bb_strtou(p + 4 , NULL, 10), SWAP_FLAG_PRIO_MASK);
/* We want to allow "NNNN,foo", thus errno == EINVAL is allowed too */
if (errno != ERANGE) {
g_flags = SWAP_FLAG_PREFER |