scan: wps: remove useless string length checks

If we're going to print using %*s, then there's no need
to check the length first - zero is fine and results in
no memory access.

Change-Id: I68a4ebd0be8e5c03670d475fe664597b6046df39
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/scan.c b/scan.c
index c784159d85d9e6f1edd14d72433b1e7ed278ea9a..32ada44d9a17922cb885a529ce69422fb7f0e0cf 100644 (file)
--- a/scan.c
+++ b/scan.c
@@ -1858,11 +1858,6 @@ static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data,
                        break;
                case 0x1011:
                        tab_on_first(&first);
-                       if (sublen < 1) {
-                               printf("\t * Device Name: (invalid length %d)\n",
-                                      sublen);
-                               break;
-                       }
                        printf("\t * Device name: %.*s\n", sublen, data + 4);
                        break;
                case 0x1012: {
@@ -1880,29 +1875,14 @@ static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data,
                }
                case 0x1021:
                        tab_on_first(&first);
-                       if (sublen < 1) {
-                               printf("\t * Manufacturer: (invalid length %d)\n",
-                                      sublen);
-                               break;
-                       }
                        printf("\t * Manufacturer: %.*s\n", sublen, data + 4);
                        break;
                case 0x1023:
                        tab_on_first(&first);
-                       if (sublen < 1) {
-                               printf("\t * Model: (invalid length %d)\n",
-                                      sublen);
-                               break;
-                       }
                        printf("\t * Model: %.*s\n", sublen, data + 4);
                        break;
                case 0x1024:
                        tab_on_first(&first);
-                       if (sublen < 1) {
-                               printf("\t * Model Number: (invalid length %d)\n",
-                                      sublen);
-                               break;
-                       }
                        printf("\t * Model Number: %.*s\n", sublen, data + 4);
                        break;
                case 0x103b: {
@@ -1947,11 +1927,6 @@ static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data,
                }
                case 0x1042:
                        tab_on_first(&first);
-                       if (sublen < 1) {
-                               printf("\t * Serial Number: (invalid length %d)\n",
-                                      sublen);
-                               break;
-                       }
                        printf("\t * Serial Number: %.*s\n", sublen, data + 4);
                        break;
                case 0x1044: {