[PATCH] iw: Fix return values when parameters are wrong

[Ola Olsson <ola1olsson@xxxxxxxxx>]

According to header file, wrong parameters
yield 1 as return value.
Also tried to fix the comments since one part
of it was unreadable.

Signed-off-by: Ola Olsson <ola1olsson@xxxxxxxxx>
---
 interface.c |    6 ++----
 iw.h        |    4 ++--
 ps.c        |    6 ++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/interface.c b/interface.c
index 4f0821d..e931454 100644
--- a/interface.c
+++ b/interface.c
@@ -559,10 +559,8 @@ static int set_mcast_rate(struct nl80211_state *state,
     float rate;
     char *end;

-    if (argc != 1) {
-        printf("Invalid parameters!\n");
-        return 2;
-    }
+    if (argc != 1)
+        return 1;

     rate = strtod(argv[0], &end);
     if (*end != '\0')
diff --git a/iw.h b/iw.h
index cef9da8..263e8b1 100644
--- a/iw.h
+++ b/iw.h
@@ -48,8 +48,8 @@ struct cmd {
     const enum command_identify_by idby;
     /*
      * The handler should return a negative error code,
-     * zero on success, 1 if the arguments were wrong
-     * and the usage message should and 2 otherwise.
+     * zero on success, 1 if the arguments were wrong.
+     * Return 2 iff you provide the error message yourself.
      */
     int (*handler)(struct nl80211_state *state,
                struct nl_msg *msg,
diff --git a/ps.c b/ps.c
index b774b7e..de36d2b 100644
--- a/ps.c
+++ b/ps.c
@@ -15,10 +15,8 @@ static int set_power_save(struct nl80211_state *state,
 {
     enum nl80211_ps_state ps_state;

-    if (argc != 1) {
-        printf("Invalid parameters!\n");
-        return 2;
-    }
+    if (argc != 1)
+        return 1;

     if (strcmp(argv[0], "on") == 0)
         ps_state = NL80211_PS_ENABLED;
-- 
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html