Simplify eapol_sm_get_mib() result handling
authorJouni Malinen <j@w1.fi>
Sat, 13 Dec 2014 17:15:38 +0000 (19:15 +0200)
committerJouni Malinen <j@w1.fi>
Sat, 13 Dec 2014 17:15:38 +0000 (19:15 +0200)
This function cannot return negative value, so no need to check for
that. If there is not enough room in the buffer or if something
unexpected happens, 0 is returned.

Signed-off-by: Jouni Malinen <j@w1.fi>
wpa_supplicant/ctrl_iface.c

index 74fab9f..c663512 100644 (file)
@@ -7021,13 +7021,9 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
        } else if (os_strcmp(buf, "MIB") == 0) {
                reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
                if (reply_len >= 0) {
-                       int res;
-                       res = eapol_sm_get_mib(wpa_s->eapol, reply + reply_len,
-                                              reply_size - reply_len);
-                       if (res < 0)
-                               reply_len = -1;
-                       else
-                               reply_len += res;
+                       reply_len += eapol_sm_get_mib(wpa_s->eapol,
+                                                     reply + reply_len,
+                                                     reply_size - reply_len);
                }
        } else if (os_strncmp(buf, "STATUS", 6) == 0) {
                reply_len = wpa_supplicant_ctrl_iface_status(