From: Rob Landley <rob@landley.net>
Date: Sun, 19 Feb 2012 23:37:49 +0000 (-0600)
Subject: Minor tweaks.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c9ac8ee7d85b630618ed0b7b87084d9d014ec00;p=platform%2Fupstream%2Ftoybox.git

Minor tweaks.
---

diff --git a/toys/swapon.c b/toys/swapon.c
index 36e4507..16ce8d1 100644
--- a/toys/swapon.c
+++ b/toys/swapon.c
@@ -12,9 +12,9 @@ config SWAPON
 	bool "swapon"
 	default y
 	help
-	  usage: swapon swapregion
+	  usage: swapon [-p priority] filename
 
-	  Enable swapping on a given swapregion.
+	  Enable swapping on a given device/file.
 */
 
 #include "toys.h"
@@ -30,9 +30,8 @@ void swapon_main(void)
 	int flags = 0;
 
 	if (toys.optflags & 1)
-		flags = SWAP_FLAG_PREFER |
-			((TT.priority & SWAP_FLAG_PRIO_MASK) << SWAP_FLAG_PRIO_SHIFT);
+		flags = SWAP_FLAG_PREFER | (TT.priority << SWAP_FLAG_PRIO_SHIFT);
 
-	if (swapon(toys.optargs[0], flags))
-		perror_exit("failed to enable swaparea");
+	if (swapon(*toys.optargs, flags))
+		perror_exit("Couldn't swapon '%s'", *toys.optargs);
 }